March 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r2044 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:54:50 2008 New Revision: 2044 Log: return real number of bytes written Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:54:50 2008 @@ -335,7 +335,7 @@ static int DCA_encode_frame(AVCodecConte put_frame(c, c->subband, frame); - return 4000; + return put_bits_count(&c->pb)>>3; } static int DCA_encode_init(AVCodecContext *avctx) {

1 0

[soc]: r2043 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:54:12 2008 New Revision: 2043 Log: incorrect input array referencing Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:54:12 2008 @@ -327,7 +327,7 @@ static int DCA_encode_frame(AVCodecConte for (channel=0; channel<2 ; channel++) { /* Get 32 PCM samples */ for (k = 0; k < 32; k++) { /* k is the sample number in a 32-sample block */ - c->pcm[k] = samples[4 * (32*i+k) + 2 * channel] << 16; + c->pcm[k] = samples[2 * (32*i+k) + channel] << 16; } /* Put subband samples into the proper place */ qmf_decompose(c, c->pcm, &c->subband[i][channel][0], channel);

1 0

[soc]: r2042 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:53:05 2008 New Revision: 2042 Log: put_bits() arguments were swapped Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:53:05 2008 @@ -297,7 +297,7 @@ static void put_subframe(DCAContext *c, for (i = 0; i < 8; i++) put_bits(&c->pb, 16, quantize(subband_data[ss * 8 + i][ch][sub])); /* DSYNC */ - put_bits(&c->pb, 0xffff, 16); + put_bits(&c->pb, 16, 0xffff); } void put_frame(DCAContext *c, int32_t subband_data[64][2][32], uint8_t *frame)

1 0

[soc]: r2041 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:52:32 2008 New Revision: 2041 Log: remove unneeded align_put_bits() Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:52:32 2008 @@ -297,7 +297,6 @@ static void put_subframe(DCAContext *c, for (i = 0; i < 8; i++) put_bits(&c->pb, 16, quantize(subband_data[ss * 8 + i][ch][sub])); /* DSYNC */ - align_put_bits(&c->pb); put_bits(&c->pb, 0xffff, 16); }

1 0

[soc]: r2040 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:50:59 2008 New Revision: 2040 Log: prevent appearing of false syncwords Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:50:59 2008 @@ -246,7 +246,7 @@ static void put_primary_audio_header(DCA static uint32_t quantize(int32_t d) { d = d >> 16; - return d & 0xffff; + return d & 0xfffe; //XXX: this is done to avoid false syncwords }

1 0

[soc]: r2039 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:50:07 2008 New Revision: 2039 Log: with avctx->frame_size set no temporary sample buffers are needed Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:50:07 2008 @@ -26,8 +26,6 @@ typedef struct { int32_t pcm[DCA_SUBBANDS_32]; int32_t subband[64][MAX_CHANNELS][DCA_SUBBANDS_32]; /* [sample][channel][subband] */ - int16_t st_samples[4096]; - int fill_samples; } DCAContext; static int32_t cos_table[128]; @@ -321,26 +319,16 @@ static int DCA_encode_frame(AVCodecConte { int i,k,channel; DCAContext *c = avctx->priv_data; -// int16_t *samples = data; + int16_t *samples = data; // if (buf_size < MAX_CHANNELS*2048*sizeof(int16_t)) // return -1; - // We always get 2048 16bit samples per call so save then until next call - - if (c->fill_samples) { - memcpy(c->st_samples, data, 2048*sizeof(int16_t)); - c->fill_samples = 0; - return 0; - } - memcpy(&c->st_samples[2048], data, 2048*sizeof(int16_t)); - c->fill_samples = 0; - for (i = 0; i < 64; i ++) /* i is the decimated sample number */ for (channel=0; channel<2 ; channel++) { /* Get 32 PCM samples */ for (k = 0; k < 32; k++) { /* k is the sample number in a 32-sample block */ - c->pcm[k] = c->st_samples[4 * (32*i+k) + 2 * channel] << 16; + c->pcm[k] = samples[4 * (32*i+k) + 2 * channel] << 16; } /* Put subband samples into the proper place */ qmf_decompose(c, c->pcm, &c->subband[i][channel][0], channel); @@ -359,8 +347,7 @@ static int DCA_encode_init(AVCodecContex return -1; } - // Make sure that the first call to encode is a fill call - c->fill_samples = 1; + avctx->frame_size = 2048; qmf_init(); return 0;

1 0

[soc]: r2030 - libavfilter/diffs/04_ffmpeg_filters.diff
by vitor 25 Mar '08

25 Mar '08

Author: vitor Date: Mon Mar 24 20:20:14 2008 New Revision: 2030 Log: Reduce ffmpeg.c dependance in avfilter_vf_graph Modified: libavfilter/diffs/04_ffmpeg_filters.diff Modified: libavfilter/diffs/04_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/04_ffmpeg_filters.diff (original) +++ libavfilter/diffs/04_ffmpeg_filters.diff Mon Mar 24 20:20:14 2008 @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 11963) +--- ffmpeg.c (revision 12379) +++ ffmpeg.c (working copy) @@ -36,6 +36,11 @@ #include "avstring.h" @@ -14,7 +14,7 @@ Index: ffmpeg.c #if !defined(HAVE_GETRUSAGE) && defined(HAVE_GETPROCESSTIMES) #include <windows.h> #endif -@@ -139,6 +144,9 @@ +@@ -135,6 +140,9 @@ static int loop_input = 0; static int loop_output = AVFMT_NOOUTPUTLOOP; static int qp_hist = 0; @@ -24,7 +24,7 @@ Index: ffmpeg.c static int intra_only = 0; static int audio_sample_rate = 44100; -@@ -277,6 +285,13 @@ +@@ -273,6 +281,13 @@ is not defined */ int64_t pts; /* current pts */ int is_start; /* is 1 at the start and after a discontinuity */ @@ -38,7 +38,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -292,6 +307,269 @@ +@@ -288,6 +303,260 @@ static struct termios oldtty; #endif @@ -207,8 +207,6 @@ Index: ffmpeg.c +static int configure_filters(AVInputStream *ist, AVOutputStream *ost) +{ + AVFilterContext *curr_filter; -+ /** filter graph containing the user specified filters */ -+ AVFilterContext *filt_graph; + /** filter graph containing all filters including input & output */ + AVFilterContext *filt_graph_all; + AVCodecContext *codec = ost->st->codec; @@ -277,16 +275,9 @@ Index: ffmpeg.c + } + + if(vfilters) { -+ if(!(filt_graph = avfilter_open(avfilter_get_by_name("graph"), NULL))) -+ return -1; -+ if(avfilter_init_filter(filt_graph, vfilters, NULL)) -+ return -1; -+ if(avfilter_link(curr_filter, 0, filt_graph, 0)) -+ return -1; -+ if(avfilter_link(filt_graph, 0, ist->out_video_filter, 0)) -+ return -1; -+ -+ avfilter_graph_add_filter(filt_graph_all, filt_graph); ++ graph_load_from_desc3(filt_graph_all, ++ avfilter_graph_parse_chain(vfilters), ++ curr_filter, 0, ist->out_video_filter, 0); + } else { + if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0) + return -1; @@ -308,7 +299,7 @@ Index: ffmpeg.c static void term_exit(void) { #ifdef HAVE_TERMIOS_H -@@ -754,6 +1032,9 @@ +@@ -754,6 +1023,9 @@ if (nb_frames <= 0) return; @@ -318,7 +309,7 @@ Index: ffmpeg.c if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); -@@ -763,6 +1044,7 @@ +@@ -763,6 +1035,7 @@ } else { formatted_picture = in_picture; } @@ -326,7 +317,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -778,12 +1060,14 @@ +@@ -778,12 +1051,14 @@ } } @@ -341,7 +332,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1163,6 +1447,17 @@ +@@ -1165,6 +1440,17 @@ &buffer_to_free); } @@ -359,7 +350,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1225,10 +1520,23 @@ +@@ -1227,10 +1513,23 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -383,7 +374,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: do_subtitle_out(os, ost, ist, &subtitle, -@@ -1689,10 +1997,21 @@ +@@ -1693,10 +1992,21 @@ fprintf(stderr, "Cannot get resampling context\n"); exit(1); } @@ -405,7 +396,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3803,6 +4122,9 @@ +@@ -3804,6 +4114,9 @@ #ifdef CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif

3 2

[soc] [propchange]: r2030 - svn:log
by vitor 25 Mar '08

25 Mar '08

Author: vitor Revision: 2030 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Reduce ffmpeg.c dependance in avfilter_vf_graph \ No newline at end of file +Reduce ffmpeg.c dependance on avfilter_vf_graph

1 0

[soc]: r2036 - aac/aac.c
by andoma 25 Mar '08

25 Mar '08

Author: andoma Date: Tue Mar 25 16:33:44 2008 New Revision: 2036 Log: Correctly decode intensity stereo when in short window mode. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Tue Mar 25 16:33:44 2008 @@ -1489,8 +1489,8 @@ static void ms_tool(AACContext * ac, cpe static void intensity_tool(AACContext * ac, cpe_struct * cpe) { const ics_struct * ics = &cpe->ch[1].ics; - sce_struct * sce0 = &cpe->ch[0]; sce_struct * sce1 = &cpe->ch[1]; + float *coef0 = cpe->ch[0].coeffs, *coef1 = cpe->ch[1].coeffs; if (ics->intensity_present) { const uint16_t * offsets = ics->swb_offset; int g, gp, i, k; @@ -1504,11 +1504,13 @@ static void intensity_tool(AACContext * if (cpe->ms.present) c *= 1 - 2 * cpe->ms.mask[g][i]; scale = c * sce1->sf[g][i]; - for (k = offsets[i] + gp*128; k < offsets[i+1] + gp*128; k++) { - sce1->coeffs[k] = scale * sce0->coeffs[k]; + for (k = offsets[i]; k < offsets[i+1]; k++) { + coef1[k] = scale * coef0[k]; } } } + coef0 += 128; + coef1 += 128; } } }

3 2

[soc]: r2038 - aac/aac.c
by andoma 25 Mar '08

25 Mar '08

Author: andoma Date: Tue Mar 25 17:05:20 2008 New Revision: 2038 Log: Remove superfluous curly brackets Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Tue Mar 25 17:05:20 2008 @@ -2262,13 +2262,12 @@ static int aac_decode_frame(AVCodecConte case ID_CPE: err = channel_pair_element(ac, &gb, tag); break; - case ID_FIL: { + case ID_FIL: if (tag == 15) tag += get_bits(&gb, 8) - 1; while (tag > 0) tag -= extension_payload(ac, &gb, tag); err = 0; /* FIXME */ break; - } case ID_PCE: err = program_config_element(ac, &gb); break;

1 0