Port pred4x4_down_left_mmxext (H.264 intra prediction) from x264 to FFmpeg.

[ffmpeg] / libavcodec / g729dec.c

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 628aee0166d2646d51d672254c7b4a8b86502daa..3a6fb0fb7a2b6f1ade9d4da9bb022adc780ff443 100644 (file)
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -81,6 +81,8 @@ typedef struct {
 } G729FormatDescription;
 
 typedef struct {
+    int pitch_delay_int_prev;   ///< integer part of previous subframe's pitch delay (4.1.3)
+
     /// (2.13) LSP quantizer outputs
     int16_t  past_quantizer_output_buf[MA_NP + 1][10];
     int16_t* past_quantizer_outputs[MA_NP + 1];
@@ -169,7 +171,7 @@ static av_cold int decoder_init(AVCodecContext * avctx)
 
     if (avctx->channels != 1) {
         av_log(avctx, AV_LOG_ERROR, "Only mono sound is supported (requested channels: %d).\n", avctx->channels);
-        return AVERROR_NOFMT;
+        return AVERROR(EINVAL);
     }
 
     /* Both 8kbit/s and 6.4kbit/s modes uses two subframes per frame. */
@@ -206,6 +208,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     uint8_t quantizer_2nd_lo; ///< second stage lower vector of quantizer (size in bits)
     uint8_t quantizer_2nd_hi; ///< second stage higher vector of quantizer (size in bits)
 
+    int pitch_delay_int;         // pitch delay, integer part
+    int pitch_delay_3x;          // pitch delay, multiplied by 3
+
     if (*data_size < SUBFRAME_SIZE << 2) {
         av_log(avctx, AV_LOG_ERROR, "Error processing packet: output buffer too small\n");
         return AVERROR(EIO);
@@ -219,7 +224,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         av_log(avctx, AV_LOG_DEBUG, "Packet type: %s\n", "G.729D @ 6.4kbit/s");
     } else {
         av_log(avctx, AV_LOG_ERROR, "Packet size %d is unknown.\n", buf_size);
-        return (AVERROR_NOFMT);
+        return AVERROR_INVALIDDATA;
     }
 
     for (i=0; i < buf_size; i++)
@@ -258,12 +263,30 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         gc_1st_index  = get_bits(&gb, format.gc_1st_index_bits);
         gc_2nd_index  = get_bits(&gb, format.gc_2nd_index_bits);
 
-        ff_acelp_weighted_vector_sum(fc + pitch_delay_int[i],
-                                     fc + pitch_delay_int[i],
+        if(!i) {
+            if (bad_pitch)
+                pitch_delay_3x   = 3 * ctx->pitch_delay_int_prev;
+            else
+                pitch_delay_3x = ff_acelp_decode_8bit_to_1st_delay3(ac_index);
+        } else {
+            int pitch_delay_min = av_clip(ctx->pitch_delay_int_prev - 5,
+                                          PITCH_DELAY_MIN, PITCH_DELAY_MAX - 9);
+
+            if(packet_type == FORMAT_G729D_6K4)
+                pitch_delay_3x = ff_acelp_decode_4bit_to_2nd_delay3(ac_index, pitch_delay_min);
+            else
+                pitch_delay_3x = ff_acelp_decode_5_6_bit_to_2nd_delay3(ac_index, pitch_delay_min);
+        }
+
+        /* Round pitch delay to nearest (used everywhere except ff_acelp_interpolate). */
+        pitch_delay_int  = (pitch_delay_3x + 1) / 3;
+
+        ff_acelp_weighted_vector_sum(fc + pitch_delay_int,
+                                     fc + pitch_delay_int,
                                      fc, 1 << 14,
                                      av_clip(ctx->gain_pitch, SHARP_MIN, SHARP_MAX),
                                      0, 14,
-                                     SUBFRAME_SIZE - pitch_delay_int[i]);
+                                     SUBFRAME_SIZE - pitch_delay_int);
 
         if (frame_erasure) {
             ctx->gain_pitch = (29491 * ctx->gain_pitch) >> 15; // 0.90 (0.15)
@@ -281,6 +304,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
                                      (!voicing && frame_erasure) ? 0 : ctx->gain_pitch,
                                      ( voicing && frame_erasure) ? 0 : ctx->gain_code,
                                      1 << 13, 14, SUBFRAME_SIZE);
+
+            ctx->pitch_delay_int_prev = pitch_delay_int;
     }
 
     *data_size = SUBFRAME_SIZE << 2;
@@ -290,7 +315,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 AVCodec g729_decoder =
 {
     "g729",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_G729,
     sizeof(G729Context),
     decoder_init,