kmvc: Clip pixel position to valid range

[ffmpeg] / libavcodec / libopusdec.c

diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c
index 4335bd6eca5cd5b39afb41fdd1fea44d080bcb1e..8c33e91a74be32dec4e56a206185f5d9d4e3ff17 100644 (file)
--- a/libavcodec/libopusdec.c
+++ b/libavcodec/libopusdec.c
@@ -22,40 +22,18 @@
 #include <opus.h>
 #include <opus_multistream.h>
 
-#include "libavutil/common.h"
 #include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "internal.h"
 #include "vorbis.h"
 #include "mathops.h"
+#include "libopus.h"
 
 struct libopus_context {
     OpusMSDecoder *dec;
-    AVFrame frame;
 };
 
-static int opus_error_to_averror(int err)
-{
-    switch (err) {
-    case OPUS_BAD_ARG:
-        return AVERROR(EINVAL);
-    case OPUS_BUFFER_TOO_SMALL:
-        return AVERROR_UNKNOWN;
-    case OPUS_INTERNAL_ERROR:
-        return AVERROR(EFAULT);
-    case OPUS_INVALID_PACKET:
-        return AVERROR_INVALIDDATA;
-    case OPUS_UNIMPLEMENTED:
-        return AVERROR(ENOSYS);
-    case OPUS_INVALID_STATE:
-        return AVERROR_UNKNOWN;
-    case OPUS_ALLOC_FAIL:
-        return AVERROR(ENOMEM);
-    default:
-        return AVERROR(EINVAL);
-    }
-}
-
 #define OPUS_HEAD_SIZE 19
 
 static av_cold int libopus_decode_init(AVCodecContext *avc)
@@ -107,7 +85,7 @@ static av_cold int libopus_decode_init(AVCodecContext *avc)
     if (!opus->dec) {
         av_log(avc, AV_LOG_ERROR, "Unable to create decoder: %s\n",
                opus_strerror(ret));
-        return opus_error_to_averror(ret);
+        return ff_opus_error_to_averror(ret);
     }
 
     ret = opus_multistream_decoder_ctl(opus->dec, OPUS_SET_GAIN(gain_db));
@@ -116,8 +94,7 @@ static av_cold int libopus_decode_init(AVCodecContext *avc)
                opus_strerror(ret));
 
     avc->delay = 3840;  /* Decoder delay (in samples) at 48kHz */
-    avcodec_get_frame_defaults(&opus->frame);
-    avc->coded_frame = &opus->frame;
+
     return 0;
 }
 
@@ -131,14 +108,15 @@ static av_cold int libopus_decode_close(AVCodecContext *avc)
 
 #define MAX_FRAME_SIZE (960 * 6)
 
-static int libopus_decode(AVCodecContext *avc, void *frame,
+static int libopus_decode(AVCodecContext *avc, void *data,
                           int *got_frame_ptr, AVPacket *pkt)
 {
     struct libopus_context *opus = avc->priv_data;
+    AVFrame *frame               = data;
     int ret, nb_samples;
 
-    opus->frame.nb_samples = MAX_FRAME_SIZE;
-    ret = avc->get_buffer(avc, &opus->frame);
+    frame->nb_samples = MAX_FRAME_SIZE;
+    ret = ff_get_buffer(avc, frame, 0);
     if (ret < 0) {
         av_log(avc, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
@@ -146,22 +124,22 @@ static int libopus_decode(AVCodecContext *avc, void *frame,
 
     if (avc->sample_fmt == AV_SAMPLE_FMT_S16)
         nb_samples = opus_multistream_decode(opus->dec, pkt->data, pkt->size,
-                                             (opus_int16 *)opus->frame.data[0],
-                                             opus->frame.nb_samples, 0);
+                                             (opus_int16 *)frame->data[0],
+                                             frame->nb_samples, 0);
     else
         nb_samples = opus_multistream_decode_float(opus->dec, pkt->data, pkt->size,
-                                                   (float *)opus->frame.data[0],
-                                                   opus->frame.nb_samples, 0);
+                                                   (float *)frame->data[0],
+                                                   frame->nb_samples, 0);
 
     if (nb_samples < 0) {
         av_log(avc, AV_LOG_ERROR, "Decoding error: %s\n",
                opus_strerror(nb_samples));
-        return opus_error_to_averror(nb_samples);
+        return ff_opus_error_to_averror(nb_samples);
     }
 
-    opus->frame.nb_samples = nb_samples;
-    *(AVFrame *)frame = opus->frame;
-    *got_frame_ptr = 1;
+    frame->nb_samples = nb_samples;
+    *got_frame_ptr    = 1;
+
     return pkt->size;
 }