vc1_parser.o does not depend on h263dec.o and intrax8.o.

[ffmpeg] / libavcodec / libgsm.c

diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c
index 3ae5567f72c0974fb9a1c7ffb3ee3b3b1560bfc4..a9ee7d040daab9c0136b70b4ba053eac6a742973 100644 (file)
--- a/libavcodec/libgsm.c
+++ b/libavcodec/libgsm.c
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file libgsm.c
+ * @file libavcodec/libgsm.c
  * Interface to libgsm for gsm encoding/decoding
  */
 
@@ -36,8 +36,36 @@
 #define GSM_FRAME_SIZE 160
 
 static av_cold int libgsm_init(AVCodecContext *avctx) {
-    if (avctx->channels > 1 || avctx->sample_rate != 8000 || avctx->bit_rate != 13000)
+    if (avctx->channels > 1) {
+        av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
+               avctx->channels);
         return -1;
+    }
+
+    if(avctx->codec->decode){
+        if(!avctx->channels)
+            avctx->channels= 1;
+
+        if(!avctx->sample_rate)
+            avctx->sample_rate= 8000;
+
+        avctx->sample_fmt = SAMPLE_FMT_S16;
+    }else{
+        if (avctx->sample_rate != 8000) {
+            av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
+                avctx->sample_rate);
+            if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
+                return -1;
+        }
+        if (avctx->bit_rate != 13000 /* Official */ &&
+            avctx->bit_rate != 13200 /* Very common */ &&
+            avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
+            av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
+                avctx->bit_rate);
+            if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
+                return -1;
+        }
+    }
 
     avctx->priv_data = gsm_create();
 
@@ -61,6 +89,7 @@ static av_cold int libgsm_init(AVCodecContext *avctx) {
 }
 
 static av_cold int libgsm_close(AVCodecContext *avctx) {
+    av_freep(&avctx->coded_frame);
     gsm_destroy(avctx->priv_data);
     avctx->priv_data = NULL;
     return 0;
@@ -91,6 +120,8 @@ AVCodec libgsm_encoder = {
     libgsm_init,
     libgsm_encode_frame,
     libgsm_close,
+    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };
 
 AVCodec libgsm_ms_encoder = {
@@ -101,14 +132,17 @@ AVCodec libgsm_ms_encoder = {
     libgsm_init,
     libgsm_encode_frame,
     libgsm_close,
+    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };
 
 static int libgsm_decode_frame(AVCodecContext *avctx,
                                void *data, int *data_size,
-                               uint8_t *buf, int buf_size) {
-
-    if(buf_size < avctx->block_align) return 0;
-
+                               AVPacket *avpkt) {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
+    *data_size = 0; /* In case of error */
+    if(buf_size < avctx->block_align) return -1;
     switch(avctx->codec_id) {
     case CODEC_ID_GSM:
         if(gsm_decode(avctx->priv_data,buf,data)) return -1;
@@ -131,6 +165,7 @@ AVCodec libgsm_decoder = {
     NULL,
     libgsm_close,
     libgsm_decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };
 
 AVCodec libgsm_ms_decoder = {
@@ -142,4 +177,5 @@ AVCodec libgsm_ms_decoder = {
     NULL,
     libgsm_close,
     libgsm_decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };