June 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc] [propchange]: r4385 - svn:log
by cmcq 04 Jun '09

04 Jun '09

Author: cmcq Revision: 4385 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ -p->pitch_vector was not being set \ No newline at end of file +decode_pitch_vector must store its result in p->pitch_vector +p->pitch_vector is used for synthesis but it was never being set.

1 0

[soc]: r4386 - aacenc/3gpp-based/checkout.sh aacenc/checkout.sh rtmp/checkout.sh
by diego 04 Jun '09

04 Jun '09

Author: diego Date: Thu Jun 4 15:40:55 2009 New Revision: 4386 Log: Remove redundant backslashes in shell scripts. Modified: aacenc/3gpp-based/checkout.sh aacenc/checkout.sh rtmp/checkout.sh Modified: aacenc/3gpp-based/checkout.sh ============================================================================== --- aacenc/3gpp-based/checkout.sh Thu Jun 4 12:56:20 2009 (r4385) +++ aacenc/3gpp-based/checkout.sh Thu Jun 4 15:40:55 2009 (r4386) @@ -1,11 +1,11 @@ #!/bin/sh echo "Checking out FFmpeg SVN trunk code..." -svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && \ +svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && cd ffmpeg echo "Patching build system" -patch -p1 < ../aac_enc.patch && \ +patch -p1 < ../aac_enc.patch && cd libavcodec echo "Copying and downloading source code to libavcodec dir" Modified: aacenc/checkout.sh ============================================================================== --- aacenc/checkout.sh Thu Jun 4 12:56:20 2009 (r4385) +++ aacenc/checkout.sh Thu Jun 4 15:40:55 2009 (r4386) @@ -1,11 +1,11 @@ #!/bin/sh echo "Checking out FFmpeg SVN trunk code..." -svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && \ +svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && cd ffmpeg echo "Patching build system" -patch -p1 < ../aac_enc.patch && \ +patch -p1 < ../aac_enc.patch && cd libavcodec echo "Copying and downloading source code to libavcodec dir" Modified: rtmp/checkout.sh ============================================================================== --- rtmp/checkout.sh Thu Jun 4 12:56:20 2009 (r4385) +++ rtmp/checkout.sh Thu Jun 4 15:40:55 2009 (r4386) @@ -1,11 +1,11 @@ #!/bin/sh echo "Checking out FFmpeg SVN trunk code..." -svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && \ +svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && cd ffmpeg echo "Patching build system" -patch -p1 < ../rtmp.patch && \ +patch -p1 < ../rtmp.patch && cd libavformat echo "Copying source code to libavformat dir"

1 0

[soc] [propchange]: r4385 - svn:log
by cmcq 04 Jun '09

04 Jun '09

Author: cmcq Revision: 4385 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Set p->pitch_vector \ No newline at end of file +p->pitch_vector was not being set \ No newline at end of file

4 4

[soc]: r4385 - amr/amrnbfloatdec.c
by cmcq 04 Jun '09

04 Jun '09

Author: cmcq Date: Thu Jun 4 12:56:20 2009 New Revision: 4385 Log: Set st->pitch_vector Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Jun 4 12:21:31 2009 (r4384) +++ amr/amrnbfloatdec.c Thu Jun 4 12:56:20 2009 (r4385) @@ -492,6 +492,8 @@ static void decode_pitch_vector(AMRConte // vector interp_pitch_vector(p->excitation, p->pitch_lag_int, pitch_lag_frac, p->cur_frame_mode); + + memcpy(p->pitch_vector, p->excitation, AMR_SUBFRAME_SIZE * sizeof(float)); } /// @}

2 1

[soc] [propchange]: r4385 - svn:log
by cmcq 04 Jun '09

04 Jun '09

Author: cmcq Revision: 4385 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Set st->pitch_vector +Set p->pitch_vector \ No newline at end of file

1 0

[soc]: r4384 - rtmp/rtmpproto.c
by kostya 04 Jun '09

04 Jun '09

Author: kostya Date: Thu Jun 4 12:21:31 2009 New Revision: 4384 Log: cosmetics: remove empty lines for better readability Modified: rtmp/rtmpproto.c Modified: rtmp/rtmpproto.c ============================================================================== --- rtmp/rtmpproto.c Thu Jun 4 12:20:38 2009 (r4383) +++ rtmp/rtmpproto.c Thu Jun 4 12:21:31 2009 (r4384) @@ -49,9 +49,7 @@ typedef struct RTMPContext { * url syntax: rtp://host:port[?option=val...] * option: 'ttl=n' : set the ttl value (for multicast only) * 'localport=n' : set the local port to n - * */ - static int rtmp_open(URLContext *h, const char *uri, int flags) { RTMPContext *s;

1 0

[soc]: r4383 - rtmp/rtmp.h
by kostya 04 Jun '09

04 Jun '09

Author: kostya Date: Thu Jun 4 12:20:38 2009 New Revision: 4383 Log: cosmetics: add empty line for better readability Modified: rtmp/rtmp.h Modified: rtmp/rtmp.h ============================================================================== --- rtmp/rtmp.h Thu Jun 4 08:57:37 2009 (r4382) +++ rtmp/rtmp.h Thu Jun 4 12:20:38 2009 (r4383) @@ -21,6 +21,7 @@ #ifndef AVFORMAT_RTMP_H #define AVFORMAT_RTMP_H + #include "avformat.h" /** RTMP default port */

1 0

[soc]: r4381 - in amr: amrnbfloatdata.h amrnbfloatdec.c
by cmcq 03 Jun '09

03 Jun '09

Author: cmcq Date: Thu Jun 4 01:05:07 2009 New Revision: 4381 Log: Use separate constants for clipping and scaling PCM values. Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Thu Jun 4 01:00:21 2009 (r4380) +++ amr/amrnbfloatdata.h Thu Jun 4 01:05:07 2009 (r4381) @@ -39,7 +39,8 @@ #define AMR_SUBFRAME_SIZE 40 // AMR is designed to produce 16-bit PCM samples (3GPP TS 26.090 4.2) -#define AMR_SAMPLE_SCALE 32768.0 +#define AMR_SAMPLE_BOUND 32768.0 +#define AMR_SAMPLE_SCALE (1.0/32768.0) // definition of modes for decoder #define NO_DATA 15 Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Jun 4 01:00:21 2009 (r4380) +++ amr/amrnbfloatdec.c Thu Jun 4 01:05:07 2009 (r4381) @@ -872,9 +872,9 @@ static int synthesis(AMRContext *p, floa for (i = 0; i < AMR_SUBFRAME_SIZE; i++) // detect overflow - if (fabsf(samples[i]) > AMR_SAMPLE_SCALE) { + if (fabsf(samples[i]) > AMR_SAMPLE_BOUND) { overflow_temp = 1; - samples[i] = av_clipf(samples[i], -AMR_SAMPLE_SCALE, AMR_SAMPLE_SCALE); + samples[i] = av_clipf(samples[i], -AMR_SAMPLE_BOUND, AMR_SAMPLE_BOUND); } return overflow_temp; @@ -998,7 +998,7 @@ static int amrnb_decode_frame(AVCodecCon for (i = 0; i < AMR_SUBFRAME_SIZE; i++) buf_out[subframe * AMR_SUBFRAME_SIZE + i] = - p->samples_in[LP_FILTER_ORDER + i] / AMR_SAMPLE_SCALE; + p->samples_in[LP_FILTER_ORDER + i] * AMR_SAMPLE_SCALE; } /* report how many samples we got */

1 0

[soc]: r4380 - amr/amrnbfloatdec.c
by cmcq 03 Jun '09

03 Jun '09

Author: cmcq Date: Thu Jun 4 01:00:21 2009 New Revision: 4380 Log: 5.15 and 4.75 kbit/s modes don't reset pitch lag in third subframe Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Jun 3 21:04:54 2009 (r4379) +++ amr/amrnbfloatdec.c Thu Jun 4 01:00:21 2009 (r4380) @@ -365,6 +365,8 @@ static void lsp2lpc(float *lsp, float *l * of the pitch lag for one subframe at 1/6 resolution for MODE_122, * 1/3 for other modes. * + * The choice of pitch lag is described in 3GPP TS 26.090 section 5.6.1. + * * @param lag_int integer part of pitch lag of the current subframe * @param lag_frac fractional part of pitch lag of the current subframe * @param pitch_index parsed adaptive codebook (pitch) index @@ -376,8 +378,8 @@ static void decode_pitch_lag(int *lag_in const int prev_lag_int, const int subframe, const enum Mode mode) { - // subframe 1 or 3 - if (!(subframe & 1)) { + if (subframe == 0 || + (subframe == 2 && mode != MODE_475 && mode != MODE_515)) { if (mode == MODE_122) { if (pitch_index < 463) { *lag_int = (pitch_index + 5) / 6 + 17; @@ -394,7 +396,6 @@ static void decode_pitch_lag(int *lag_in *lag_int = pitch_index - 112; *lag_frac = 0; } - // subframe 2 or 4 } else { if (mode == MODE_122) { *lag_int = (pitch_index + 5) / 6 - 1;

1 0

[soc]: r4379 - aacenc/aaccoder.c
by alexc 03 Jun '09

03 Jun '09

Author: alexc Date: Wed Jun 3 21:04:54 2009 New Revision: 4379 Log: Fix a declaration after statement from my last commit. Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Wed Jun 3 20:12:06 2009 (r4378) +++ aacenc/aaccoder.c Wed Jun 3 21:04:54 2009 (r4379) @@ -507,6 +507,7 @@ static void encode_window_bands_info(AAC next_minrd = INFINITY; next_mincb = 0; for(cb = 0; cb < 12; cb++){ + float cost_stay_here, cost_get_here; float rd = 0.0f; for(w = 0; w < group_len; w++){ FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(win+w)*16+swb]; @@ -514,8 +515,8 @@ static void encode_window_bands_info(AAC sce->sf_idx[(win+w)*16+swb], cb, lambda / band->threshold, INFINITY, NULL); } - float cost_stay_here = path[swb][cb].cost + rd; - float cost_get_here = minrd + rd + run_bits + 4; + cost_stay_here = path[swb][cb].cost + rd; + cost_get_here = minrd + rd + run_bits + 4; if( run_value_bits[sce->ics.num_windows == 8][path[swb][cb].run] != run_value_bits[sce->ics.num_windows == 8][path[swb][cb].run+1]) cost_stay_here += run_bits;

1 0