September 2005 - ffmpeg-cvslog

CVS: ffmpeg/libavformat utils.c,1.160,1.161
by michael＠mplayerhq.hu 01 Oct '05

01 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv16066 Modified Files: utils.c Log Message: a few checks, seems i forgot to commit this Index: utils.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 --- utils.c 14 Aug 2005 15:42:40 -0000 1.160 +++ utils.c 14 Aug 2005 16:19:20 -0000 1.161 @@ -2158,6 +2158,30 @@ int ret, i; AVStream *st; + // some sanity checks + for(i=0;i<s->nb_streams;i++) { + st = s->streams[i]; + + switch (st->codec->codec_type) { + case CODEC_TYPE_AUDIO: + if(st->codec->sample_rate<=0){ + av_log(s, AV_LOG_ERROR, "sample rate not set\n"); + return -1; + } + break; + case CODEC_TYPE_VIDEO: + if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too? + av_log(s, AV_LOG_ERROR, "time base not set\n"); + return -1; + } + if(st->codec->width<=0 || st->codec->height<=0){ + av_log(s, AV_LOG_ERROR, "dimensions not set\n"); + return -1; + } + break; + } + } + ret = s->oformat->write_header(s); if (ret < 0) return ret;

2 1

[Ffmpeg-cvslog] CVS: ffmpeg/doc faq.texi, 1.22, 1.23 ffmpeg-doc.texi, 1.92, 1.93
by diego＠mplayerhq.hu 30 Sep '05

30 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/doc In directory mail:/var2/tmp/cvs-serv16918/doc Modified Files: faq.texi ffmpeg-doc.texi Log Message: Since there have been quite a few questions recently on how to use the FFmpeg libraries with Visual C++, here's a patch for the documentation that explains everything in (excruciating) detail. patch by Martin Boehme <boehme -- at -- inb -- dot -- uni-luebeck -- dot -- de> Index: faq.texi =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/doc/faq.texi,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- faq.texi 13 Sep 2005 23:33:53 -0000 1.22 +++ faq.texi 28 Sep 2005 21:18:11 -0000 1.23 @@ -160,8 +160,8 @@ Yes, but the MinGW tools @emph{must} be used to compile FFmpeg. You can link the resulting DLLs with any other Windows program. Read the - at emph{Native Windows Compilation} section in the FFmpeg documentation -to find more information. + at emph{Native Windows Compilation} and @emph{Visual C++ compatibility} +sections in the FFmpeg documentation to find more information. @section Can you add automake, libtool or autoconf support ? @@ -201,6 +201,7 @@ You need a C compiler (Visual C++ is not compliant to the C standard). If you wish - for whatever weird reason - to use Visual C++ for your project then you can link the Visual C++ code with libav* as long as -you compile the latter with a working C compiler. +you compile the latter with a working C compiler. For more information, see +the @emph{Visual C++ compatibility} section in the FFmpeg documentation. @bye Index: ffmpeg-doc.texi =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffmpeg-doc.texi,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- ffmpeg-doc.texi 12 Sep 2005 16:30:46 -0000 1.92 +++ ffmpeg-doc.texi 28 Sep 2005 21:18:11 -0000 1.93 @@ -918,10 +918,134 @@ when configuring FFmpeg, FFmpeg tries to use the Microsoft Visual C++ @code{lib} tool to build @code{avcodec.lib} and @code{avformat.lib}. With these libraries you can link your Visual C++ -code directly with the FFmpeg DLLs. +code directly with the FFmpeg DLLs (see below). @end itemize + at subsection Visual C++ compatibility + +FFmpeg will not compile under Visual C++ -- and it has too many +dependencies on the GCC compiler to make a port viable. However, +if you want to use the FFmpeg libraries in your own applications, +you can still compile those applications using Visual C++. An +important restriction to this is that you have to use the +dynamically linked versions of the FFmpeg libraries (i.e. the +DLLs), and you have to make sure that Visual-C++-compatible +import libraries are created during the FFmpeg build process. + +This description of how to use the FFmpeg libraries with Visual C++ is +based on Visual C++ 2005 Express Edition Beta 2. If you have a different +version, you might have to modify the procedures slightly. + +Here are the step-by-step instructions for building the FFmpeg libraries +so they can be used with Visual C++: + + at enumerate + + at item Install Visual C++ (if you haven't done so already). + + at item Install MinGW and MSYS as described above. + + at item Add a call to @file{vcvars32.bat} (which sets up the environment +variables for the Visual C++ tools) as the first line of + at file{msys.bat}. The standard location for @file{vcvars32.bat} is + at file{C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat}, +and the standard location for @file{msys.bat} is + at file{C:\msys\1.0\msys.bat}. If this corresponds to your setup, add the +following line as the first line of @file{msys.bat}: + + at code{call "C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat"} + + at item Start the MSYS shell (file @file{msys.bat}) and type @code{link.exe}. +If you get a help message with the command line options of @code{link.exe}, +this means your environment variables are set up correctly, the +Microsoft linker is on the path and will be used by FFmpeg to +create Visual-C++-compatible import libraries. + + at item Extract the current version of FFmpeg (the latest release version or +the current CVS snapshot, whichever is recommended) and change to the +FFmpeg directory. + + at item Type the command + at code{./configure --enable-shared --enable-memalign-hack} to configure and, +if that didn't produce any errors, type @code{make} to build FFmpeg. + + at item The subdirectories @file{libavformat}, @file{libavcodec}, and + at file{libavutil} should now contain the files @file{avformat.dll}, + at file{avformat.lib}, @file{avcodec.dll}, @file{avcodec.lib}, + at file{avutil.dll}, and @file{avutil.lib}, respectively. Copy the three +DLLs to your System32 directory (typically @file{C:\Windows\System32}). + + at end enumerate + +And here is how to use these libraries with Visual C++: + + at enumerate + + at item Create a new console application ("File / New / Project") and then +select "Win32 Console Application". On the appropriate page of the +Application Wizard, uncheck the "Precompiled headers" option. + + at item Write the source code for your application, or, for testing, just +copy the code from an existing sample application into the source file +that Visual C++ has already created for you. (Note that your source +filehas to have a @code{.cpp} extension; otherwise, Visual C++ won't +compile the FFmpeg headers correctly because in C mode, it doesn't +recognize the @code{inline} keyword.) For example, you can copy + at file{output_example.c} from the FFmpeg distribution (but you will +have to make minor modifications so the code will compile under +C++, see below). + + at item Open the "Project / Properties" dialog box. In the "Configuration" +combo box, select "All Configurations" so that the changes you make will +affect both debug and release builds. In the tree view on the left hand +side, select "C/C++ / General", then edit the "Additional Include +Directories" setting to contain the complete paths to the + at file{libavformat}, @file{libavcodec}, and @file{libavutil} +subdirectories of your FFmpeg directory. Note that the directories have +to be separated using semicolons. Now select "Linker / General" from the +tree view and edit the "Additional Library Directories" setting to +contain the same three directories. + + at item Still in the "Project / Properties" dialog box, select "Linker / Input" +from the tree view, then add the files @file{avformat.lib}, + at file{avcodec.lib}, and @file{avutil.lib} to the end of the "Additional +Dependencies". Note that the names of the libraries have to be separated +using spaces. + + at item Now, select "C/C++ / Preprocessor" from the tree view. Select "Debug" +in the "Configuration" combo box. Add @code{EMULATE_INTTYPES} to the +"Preprocessor Definitions". (Note that the various preprocessor +definitions have to be separated using semicolons.) Select "Release" in +the "Configuration" combo box and, again, add @code{EMULATE_INTTYPES} to +the "Preprocessor Definitions". (This has to be done separately because +debug and release builds have different preprocessor definitions.) +Finally, select "C/C++ / Code Generation" from the tree view. Select +"Debug" in the "Configuration" combo box. Make sure that "Runtime +Library" is set to "Multi-threaded Debug DLL". Then, select "Release" in +the "Configuration" combo box and make sure that "Runtime Library" is +set to "Multi-threaded DLL". + + at item Click "OK" to close the "Project / Properties" dialog box and build +the application. Hopefully, it should compile and run cleanly. If you +used @file{output_example.c} as your sample application, you will get a +few compiler errors, but they are easy to fix. The first type of error +occurs because Visual C++ doesn't allow an @code{int} to be converted to +an @code{enum} without a cast. To solve the problem, insert the required +casts (this error occurs once for a @code{CodecID} and once for a + at code{CodecType}). The second type of error occurs because C++ requires +the return value of @code{malloc} to be cast to the exact type of the +pointer it is being assigned to. Visual C++ will complain that, for +example, @code{(void *)} is being assigned to @code{(uint8_t *)} without +an explicit cast. So insert an explicit cast in these places to silence +the compiler. The third type of error occurs because the @code{snprintf} +library function is called @code{_snprintf} under Visual C++. So just +add an underscore to fix the problem. With these changes, + at file{output_example.c} should compile under Visual C++, and the +resulting executable should produce valid video files. + + at end enumerate + @subsection Cross compilation for Windows with Linux You must use the MinGW cross compilation tools available at

4 3

CVS: ffmpeg/libavcodec/i386 dsputil_mmx.c, 1.102, 1.103
by lorenm＠mplayerhq.hu 30 Sep '05

30 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/i386 In directory mail:/var2/tmp/cvs-serv19251/libavcodec/i386 Modified Files: dsputil_mmx.c Log Message: sse2 16x16 sum squared diff (306=>268 cycles on a K8) faster 8x8 mmx ssd (77=>70 cycles) Index: dsputil_mmx.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- dsputil_mmx.c 21 Sep 2005 21:17:09 -0000 1.102 +++ dsputil_mmx.c 30 Sep 2005 02:31:47 -0000 1.103 @@ -744,31 +744,49 @@ int tmp; asm volatile ( "movl %4,%%ecx\n" + "shr $1,%%ecx\n" "pxor %%mm0,%%mm0\n" /* mm0 = 0 */ "pxor %%mm7,%%mm7\n" /* mm7 holds the sum */ "1:\n" - "movq (%0),%%mm1\n" /* mm1 = pix1[0-7] */ - "movq (%1),%%mm2\n" /* mm2 = pix2[0-7] */ + "movq (%0),%%mm1\n" /* mm1 = pix1[0][0-7] */ + "movq (%1),%%mm2\n" /* mm2 = pix2[0][0-7] */ + "movq (%0,%3),%%mm3\n" /* mm3 = pix1[1][0-7] */ + "movq (%1,%3),%%mm4\n" /* mm4 = pix2[1][0-7] */ + /* todo: mm1-mm2, mm3-mm4 */ + /* algo: substract mm1 from mm2 with saturation and vice versa */ + /* OR the results to get absolute difference */ "movq %%mm1,%%mm5\n" + "movq %%mm3,%%mm6\n" "psubusb %%mm2,%%mm1\n" + "psubusb %%mm4,%%mm3\n" "psubusb %%mm5,%%mm2\n" + "psubusb %%mm6,%%mm4\n" "por %%mm1,%%mm2\n" + "por %%mm3,%%mm4\n" + /* now convert to 16-bit vectors so we can square them */ "movq %%mm2,%%mm1\n" + "movq %%mm4,%%mm3\n" "punpckhbw %%mm0,%%mm2\n" + "punpckhbw %%mm0,%%mm4\n" "punpcklbw %%mm0,%%mm1\n" /* mm1 now spread over (mm1,mm2) */ + "punpcklbw %%mm0,%%mm3\n" /* mm4 now spread over (mm3,mm4) */ "pmaddwd %%mm2,%%mm2\n" + "pmaddwd %%mm4,%%mm4\n" "pmaddwd %%mm1,%%mm1\n" + "pmaddwd %%mm3,%%mm3\n" - "add %3,%0\n" - "add %3,%1\n" + "lea (%0,%3,2), %0\n" /* pix1 += 2*line_size */ + "lea (%1,%3,2), %1\n" /* pix2 += 2*line_size */ "paddd %%mm2,%%mm1\n" + "paddd %%mm4,%%mm3\n" "paddd %%mm1,%%mm7\n" + "paddd %%mm3,%%mm7\n" "decl %%ecx\n" "jnz 1b\n" @@ -843,6 +861,68 @@ return tmp; } +static int sse16_sse2(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h) { + int tmp; + asm volatile ( + "shr $1,%2\n" + "pxor %%xmm0,%%xmm0\n" /* mm0 = 0 */ + "pxor %%xmm7,%%xmm7\n" /* mm7 holds the sum */ + "1:\n" + "movdqu (%0),%%xmm1\n" /* mm1 = pix1[0][0-15] */ + "movdqu (%1),%%xmm2\n" /* mm2 = pix2[0][0-15] */ + "movdqu (%0,%4),%%xmm3\n" /* mm3 = pix1[1][0-15] */ + "movdqu (%1,%4),%%xmm4\n" /* mm4 = pix2[1][0-15] */ + + /* todo: mm1-mm2, mm3-mm4 */ + /* algo: substract mm1 from mm2 with saturation and vice versa */ + /* OR the results to get absolute difference */ + "movdqa %%xmm1,%%xmm5\n" + "movdqa %%xmm3,%%xmm6\n" + "psubusb %%xmm2,%%xmm1\n" + "psubusb %%xmm4,%%xmm3\n" + "psubusb %%xmm5,%%xmm2\n" + "psubusb %%xmm6,%%xmm4\n" + + "por %%xmm1,%%xmm2\n" + "por %%xmm3,%%xmm4\n" + + /* now convert to 16-bit vectors so we can square them */ + "movdqa %%xmm2,%%xmm1\n" + "movdqa %%xmm4,%%xmm3\n" + + "punpckhbw %%xmm0,%%xmm2\n" + "punpckhbw %%xmm0,%%xmm4\n" + "punpcklbw %%xmm0,%%xmm1\n" /* mm1 now spread over (mm1,mm2) */ + "punpcklbw %%xmm0,%%xmm3\n" /* mm4 now spread over (mm3,mm4) */ + + "pmaddwd %%xmm2,%%xmm2\n" + "pmaddwd %%xmm4,%%xmm4\n" + "pmaddwd %%xmm1,%%xmm1\n" + "pmaddwd %%xmm3,%%xmm3\n" + + "lea (%0,%4,2), %0\n" /* pix1 += 2*line_size */ + "lea (%1,%4,2), %1\n" /* pix2 += 2*line_size */ + + "paddd %%xmm2,%%xmm1\n" + "paddd %%xmm4,%%xmm3\n" + "paddd %%xmm1,%%xmm7\n" + "paddd %%xmm3,%%xmm7\n" + + "decl %2\n" + "jnz 1b\n" + + "movdqa %%xmm7,%%xmm1\n" + "psrldq $8, %%xmm7\n" /* shift hi qword to lo */ + "paddd %%xmm1,%%xmm7\n" + "movdqa %%xmm7,%%xmm1\n" + "psrldq $4, %%xmm7\n" /* shift hi dword to lo */ + "paddd %%xmm1,%%xmm7\n" + "movd %%xmm7,%3\n" + : "+r" (pix1), "+r" (pix2), "+r"(h), "=r"(tmp) + : "r" ((long)line_size)); + return tmp; +} + static int hf_noise8_mmx(uint8_t * pix1, int line_size, int h) { int tmp; asm volatile ( @@ -2626,7 +2706,7 @@ c->hadamard8_diff[1]= hadamard8_diff_mmx; c->pix_norm1 = pix_norm1_mmx; - c->sse[0] = sse16_mmx; + c->sse[0] = (mm_flags & MM_SSE2) ? sse16_sse2 : sse16_mmx; c->sse[1] = sse8_mmx; c->vsad[4]= vsad_intra16_mmx;

1 0

CVS: ffmpeg/doc ffmpeg-doc.texi,1.94,1.95
by mmu_man＠mplayerhq.hu 29 Sep '05

29 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/doc In directory mail:/var2/tmp/cvs-serv20658/doc Modified Files: ffmpeg-doc.texi Log Message: change my ç from latin-1 to UTF-8. UTF-8 ownz! Index: ffmpeg-doc.texi =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffmpeg-doc.texi,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- ffmpeg-doc.texi 29 Sep 2005 00:42:45 -0000 1.94 +++ ffmpeg-doc.texi 29 Sep 2005 08:04:45 -0000 1.95 @@ -1068,7 +1068,7 @@ Old stuff: -Fran?ois Revol - revol at free dot fr - April 2002 +Fran??ois Revol - revol at free dot fr - April 2002 The configure script should guess the configuration itself, however I still didn't test building on the net_server version of BeOS.

1 0

CVS: ffmpeg/doc ffmpeg-doc.texi,1.93,1.94
by diego＠mplayerhq.hu 29 Sep '05

29 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/doc In directory mail:/var2/tmp/cvs-serv11479/doc Modified Files: ffmpeg-doc.texi Log Message: Remove references to release or CVS versions, they are misleading. Index: ffmpeg-doc.texi =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffmpeg-doc.texi,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- ffmpeg-doc.texi 28 Sep 2005 21:18:11 -0000 1.93 +++ ffmpeg-doc.texi 29 Sep 2005 00:42:45 -0000 1.94 @@ -884,8 +884,7 @@ directory. Edit the @file{sdl-config} script so that it gives the correct SDL directory when invoked. - at item Extract the current version of FFmpeg (the latest release version or -the current CVS snapshot, whichever is recommended). + at item Extract the current version of FFmpeg. @item Start the MSYS shell (file @file{msys.bat}). @@ -962,9 +961,7 @@ Microsoft linker is on the path and will be used by FFmpeg to create Visual-C++-compatible import libraries. - at item Extract the current version of FFmpeg (the latest release version or -the current CVS snapshot, whichever is recommended) and change to the -FFmpeg directory. + at item Extract the current version of FFmpeg and change to the FFmpeg directory. @item Type the command @code{./configure --enable-shared --enable-memalign-hack} to configure and,

1 0

CVS: ffmpeg configure,1.201,1.202
by diego＠mplayerhq.hu 27 Sep '05

27 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv8732 Modified Files: configure Log Message: Make configure bail out when confronted with unknown options. Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.201 retrieving revision 1.202 diff -u -d -r1.201 -r1.202 --- configure 23 Sep 2005 00:25:41 -0000 1.201 +++ configure 23 Sep 2005 01:08:48 -0000 1.202 @@ -541,6 +541,11 @@ ;; --disable-demuxers) demuxers="no" ;; + *) + echo "Unknown option \"$opt\"." + echo "See $0 --help for available options." + exit 1 + ;; esac done

3 3

CVS: ffmpeg configure,1.205,1.206
by diego＠mplayerhq.hu 27 Sep '05

27 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv9985 Modified Files: configure Log Message: NetBSD build fix: A forgotten $extraflags caused -lm to fall off. patch by Jan Knutar <jknutar -- at -- nic -- dot -- fi> Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.205 retrieving revision 1.206 diff -u -d -r1.205 -r1.206 --- configure 26 Sep 2005 10:05:12 -0000 1.205 +++ configure 27 Sep 2005 08:35:12 -0000 1.206 @@ -291,7 +291,7 @@ make="gmake" LDFLAGS="$LDFLAGS -export-dynamic" case `uname -r` in -2.*) extralibs="-lossaudio" +2.*) extralibs="$extralibs -lossaudio" ;; esac ;;

1 0

CVS: ffmpeg/libavcodec h264.c,1.157,1.158
by lorenm＠mplayerhq.hu 27 Sep '05

27 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv5122 Modified Files: h264.c Log Message: 6% faster decode_cabac_residual Index: h264.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v retrieving revision 1.157 retrieving revision 1.158 diff -u -d -r1.157 -r1.158 --- h264.c 27 Sep 2005 04:46:45 -0000 1.157 +++ h264.c 27 Sep 2005 05:12:13 -0000 1.158 @@ -5517,9 +5517,6 @@ static const int significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 297 }; static const int last_significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 251 }; static const int coeff_abs_level_m1_offset[6] = { 227+0, 227+10, 227+20, 227+30, 227+39, 426 }; - static const int identity[15] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 - }; static const int significant_coeff_flag_offset_8x8[63] = { 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, @@ -5541,12 +5538,9 @@ int abslevel1 = 1; int abslevelgt1 = 0; - const int* significant_coeff_ctx_offset; - const int* last_coeff_ctx_offset; - const int significant_coeff_ctx_base = significant_coeff_flag_offset[cat] - + significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; - const int last_coeff_ctx_base = last_significant_coeff_flag_offset[cat] - + last_significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; + uint8_t *significant_coeff_ctx_base; + uint8_t *last_coeff_ctx_base; + uint8_t *abs_level_m1_ctx_base; /* cat: 0-> DC 16x16 n = 0 * 1-> AC 16x16 n = luma4x4idx @@ -5557,10 +5551,7 @@ */ /* read coded block flag */ - if( cat == 5 ) { - significant_coeff_ctx_offset = significant_coeff_flag_offset_8x8; - last_coeff_ctx_offset = last_coeff_flag_offset_8x8; - } else { + if( cat != 5 ) { if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { if( cat == 1 || cat == 2 ) h->non_zero_count_cache[scan8[n]] = 0; @@ -5569,21 +5560,34 @@ return 0; } - - significant_coeff_ctx_offset = - last_coeff_ctx_offset = identity; } - for(last= 0; last < max_coeff - 1; last++) { - int sig_ctx = significant_coeff_ctx_base + significant_coeff_ctx_offset[last]; - if( get_cabac( &h->cabac, &h->cabac_state[sig_ctx] )) { - int last_ctx = last_coeff_ctx_base + last_coeff_ctx_offset[last]; - index[coeff_count++] = last; - if( get_cabac( &h->cabac, &h->cabac_state[last_ctx] ) ) { - last= max_coeff; - break; - } + significant_coeff_ctx_base = h->cabac_state + + significant_coeff_flag_offset[cat] + + significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; + last_coeff_ctx_base = h->cabac_state + + last_significant_coeff_flag_offset[cat] + + last_significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; + abs_level_m1_ctx_base = h->cabac_state + + coeff_abs_level_m1_offset[cat]; + + if( cat == 5 ) { +#define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \ + for(last= 0; last < coefs; last++) { \ + uint8_t *sig_ctx = significant_coeff_ctx_base + sig_off; \ + if( get_cabac( &h->cabac, sig_ctx )) { \ + uint8_t *last_ctx = last_coeff_ctx_base + last_off; \ + index[coeff_count++] = last; \ + if( get_cabac( &h->cabac, last_ctx ) ) { \ + last= max_coeff; \ + break; \ + } \ + } \ } + DECODE_SIGNIFICANCE( 63, significant_coeff_flag_offset_8x8[last], + last_coeff_flag_offset_8x8[last] ); + } else { + DECODE_SIGNIFICANCE( max_coeff - 1, last, last ); } if( last == max_coeff -1 ) { index[coeff_count++] = last; @@ -5604,11 +5608,11 @@ } for( i = coeff_count - 1; i >= 0; i-- ) { - int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat]; + uint8_t *ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + abs_level_m1_ctx_base; int j= scantable[index[i]]; - if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) { - if( cat == 0 || cat == 3 ) { + if( get_cabac( &h->cabac, ctx ) == 0 ) { + if( !qmul ) { if( get_cabac_bypass( &h->cabac ) ) block[j] = -1; else block[j] = 1; }else{ @@ -5619,8 +5623,8 @@ abslevel1++; } else { int coeff_abs = 2; - ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; - while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) { + ctx = 5 + FFMIN( 4, abslevelgt1 ) + abs_level_m1_ctx_base; + while( coeff_abs < 15 && get_cabac( &h->cabac, ctx ) ) { coeff_abs++; } @@ -5637,7 +5641,7 @@ } } - if( cat == 0 || cat == 3 ) { + if( !qmul ) { if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs; else block[j] = coeff_abs; }else{ @@ -6069,7 +6073,7 @@ if( IS_INTRA16x16( mb_type ) ) { int i; //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); - if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, h->dequant4_coeff[s->qscale], 16) < 0) + if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, NULL, 16) < 0) return -1; if( cbp&15 ) { for( i = 0; i < 16; i++ ) { @@ -6111,7 +6115,7 @@ int c; for( c = 0; c < 2; c++ ) { //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); - if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, h->dequant4_coeff[h->chroma_qp], 4) < 0) + if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, NULL, 4) < 0) return -1; } }

1 0

CVS: ffmpeg/libavcodec h264.c,1.156,1.157
by lorenm＠mplayerhq.hu 27 Sep '05

27 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv23449 Modified Files: h264.c Log Message: 13% faster decode_residual (cavlc). patch by diane_cartman at gmx dot de. Index: h264.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- h264.c 21 Sep 2005 08:14:17 -0000 1.156 +++ h264.c 27 Sep 2005 04:46:45 -0000 1.157 @@ -4437,8 +4437,8 @@ static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint16_t *qmul, int max_coeff){ MpegEncContext * const s = &h->s; static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3}; - int level[16], run[16]; - int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; + int level[16]; + int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before; //FIXME put trailing_onex into the context @@ -4471,12 +4471,12 @@ level[i]= 1 - 2*get_bits1(gb); } - suffix_length= total_coeff > 10 && trailing_ones < 3; - - for(; i<total_coeff; i++){ - const int prefix= get_level_prefix(gb); + if(i<total_coeff) { int level_code, mask; + int suffix_length = total_coeff > 10 && trailing_ones < 3; + int prefix= get_level_prefix(gb); + //first coefficient has suffix_length equal to 0 or 1 if(prefix<14){ //FIXME try to build a large unified VLC table for all this if(suffix_length) level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part @@ -4495,20 +4495,32 @@ return -1; } - if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration + if(trailing_ones < 3) level_code += 2; + suffix_length = 1; + if(level_code > 5) + suffix_length++; mask= -(level_code&1); level[i]= (((2+level_code)>>1) ^ mask) - mask; + i++; - if(suffix_length==0) suffix_length=1; //FIXME split first iteration - -#if 1 - if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; -#else - if((2+level_code)>>1) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; - /* ? == prefix > 2 or sth */ -#endif - tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); + //remaining coefficients have suffix_length > 0 + for(;i<total_coeff;i++) { + static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX }; + prefix = get_level_prefix(gb); + if(prefix<15){ + level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length); + }else if(prefix==15){ + level_code = (prefix<<suffix_length) + get_bits(gb, 12); + }else{ + av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); + return -1; + } + mask= -(level_code&1); + level[i]= (((2+level_code)>>1) ^ mask) - mask; + if(level_code > suffix_limit[suffix_length]) + suffix_length++; + } } if(total_coeff == max_coeff) @@ -4519,50 +4531,49 @@ else zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); } - - for(i=0; i<total_coeff-1; i++){ - if(zeros_left <=0) - break; - else if(zeros_left < 7){ - run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); - }else{ - run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); - } - zeros_left -= run[i]; - } - - if(zeros_left<0){ - av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); - return -1; - } - - for(; i<total_coeff-1; i++){ - run[i]= 0; - } - - run[i]= zeros_left; - coeff_num=-1; + coeff_num = zeros_left + total_coeff - 1; + j = scantable[coeff_num]; if(n > 24){ - for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? - int j; - - coeff_num += run[i] + 1; //FIXME add 1 earlier ? + block[j] = level[0]; + for(i=1;i<total_coeff;i++) { + if(zeros_left <= 0) + run_before = 0; + else if(zeros_left < 7){ + run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); + }else{ + run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); + } + zeros_left -= run_before; + coeff_num -= 1 + run_before; j= scantable[ coeff_num ]; block[j]= level[i]; } }else{ - for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? - int j; - - coeff_num += run[i] + 1; //FIXME add 1 earlier ? + block[j] = level[0] * qmul[j]; + for(i=1;i<total_coeff;i++) { + if(zeros_left <= 0) + run_before = 0; + else if(zeros_left < 7){ + run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); + }else{ + run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); + } + zeros_left -= run_before; + coeff_num -= 1 + run_before; j= scantable[ coeff_num ]; block[j]= level[i] * qmul[j]; // printf("%d %d ", block[j], qmul[j]); } } + + if(zeros_left<0){ + av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); + return -1; + } + return 0; }

1 0

CVS: CVSROOT cvsignore,1.1,1.2
by diego＠mplayerhq.hu 26 Sep '05

26 Sep '05

Update of /cvsroot/ffmpeg/CVSROOT In directory mail:/var2/tmp/cvs-serv18292 Modified Files: cvsignore Log Message: Ignore .dylib files (dynamic libs on Mac OS X) Index: cvsignore =================================================================== RCS file: /cvsroot/ffmpeg/CVSROOT/cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cvsignore 15 Jan 2003 18:52:54 -0000 1.1 +++ cvsignore 26 Sep 2005 11:15:33 -0000 1.2 @@ -6,3 +6,4 @@ Makefile.* .depend *.d +*.dylib

1 0