On 28/01/15 15:40, Vittorio Giovara wrote:
---
libavfilter/vf_hqdn3d.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
index be6b761..c5d4a36 100644
--- a/libavfilter/vf_hqdn3d.c
+++ b/libavfilter/vf_hqdn3d.c
@@ -121,11 +121,11 @@ static void denoise_spatial(HQDN3DContext *s,
}
av_always_inline
-static void denoise_depth(HQDN3DContext *s,
- uint8_t *src, uint8_t *dst,
- uint16_t *line_ant, uint16_t **frame_ant_ptr,
- int w, int h, int sstride, int dstride,
- int16_t *spatial, int16_t *temporal, int depth)
+static int denoise_depth(HQDN3DContext *s,
+ uint8_t *src, uint8_t *dst,
+ uint16_t *line_ant, uint16_t **frame_ant_ptr,
+ int w, int h, int sstride, int dstride,
+ int16_t *spatial, int16_t *temporal, int depth)
{
// FIXME: For 16bit depth, frame_ant could be a pointer to the previous
// filtered frame rather than a separate buffer.
@@ -134,6 +134,8 @@ static void denoise_depth(HQDN3DContext *s,
if (!frame_ant) {
uint8_t *frame_src = src;
*frame_ant_ptr = frame_ant = av_malloc(w*h*sizeof(uint16_t));
+ if (!frame_ant)
+ return AVERROR(ENOMEM);
for (y = 0; y < h; y++, src += sstride, frame_ant += w)
for (x = 0; x < w; x++)
frame_ant[x] = LOAD(x);
@@ -148,14 +150,15 @@ static void denoise_depth(HQDN3DContext *s,
denoise_temporal(src, dst, frame_ant,
w, h, sstride, dstride, temporal, depth);
emms_c();
+ return 0;
}
#define denoise(...) \
switch (s->depth) {\
- case 8: denoise_depth(__VA_ARGS__, 8); break;\
- case 9: denoise_depth(__VA_ARGS__, 9); break;\
- case 10: denoise_depth(__VA_ARGS__, 10); break;\
- case 16: denoise_depth(__VA_ARGS__, 16); break;\
+ case 8: ret = denoise_depth(__VA_ARGS__, 8); break; \
+ case 9: ret = denoise_depth(__VA_ARGS__, 9); break; \
+ case 10: ret = denoise_depth(__VA_ARGS__, 10); break; \
+ case 16: ret = denoise_depth(__VA_ARGS__, 16); break; \
}
#define denoise(...)\
do {
int ret =
switch()
if (ret < 0)
return ret;
} while(0)
might be slightly better.
lu
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
