Menu
▾
▴
[Dirac-commits] compress/extras/patches MPlayer-1.0rc2_dirac-0.9.x.patch, 1.1, 1.2 README_MPlayer-1.0rc2_dirac-0.9.x_patch, 1.1, 1.2
|
From: Anuradha S. <asu...@us...> - 2008-01-26 11:50:23
|
Update of /cvsroot/dirac/compress/extras/patches In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv10043 Modified Files: MPlayer-1.0rc2_dirac-0.9.x.patch README_MPlayer-1.0rc2_dirac-0.9.x_patch Log Message: Fix bug# 1878017. Modified dirac detection technique to auto-detection based on extension. Fixed bug where not all frame types (.e.g no-Arith-coding intra frames) were being recognised. Index: README_MPlayer-1.0rc2_dirac-0.9.x_patch =================================================================== RCS file: /cvsroot/dirac/compress/extras/patches/README_MPlayer-1.0rc2_dirac-0.9.x_patch,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README_MPlayer-1.0rc2_dirac-0.9.x_patch 22 Jan 2008 07:10:44 -0000 1.1 --- README_MPlayer-1.0rc2_dirac-0.9.x_patch 26 Jan 2008 11:50:19 -0000 1.2 *************** *** 2,14 **** code. ! 1. Download Dirac 0.9.0 from http://sourceforge.net/projects/dirac/ 2. Unpack the Dirac source ! tar xvzf dirac-0.9.0.tar.gz 3. Build and Install ! cd dirac-0.9.0 ./configure make --- 2,14 ---- code. ! 1. Download Dirac 0.9.1 from http://sourceforge.net/projects/dirac/ 2. Unpack the Dirac source ! tar xvzf dirac-0.9.1.tar.gz 3. Build and Install ! cd dirac-0.9.1 ./configure make Index: MPlayer-1.0rc2_dirac-0.9.x.patch =================================================================== RCS file: /cvsroot/dirac/compress/extras/patches/MPlayer-1.0rc2_dirac-0.9.x.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MPlayer-1.0rc2_dirac-0.9.x.patch 22 Jan 2008 07:10:44 -0000 1.1 --- MPlayer-1.0rc2_dirac-0.9.x.patch 26 Jan 2008 11:50:19 -0000 1.2 *************** *** 1,5 **** diff -ruN MPlayer-1.0rc2/configure MPlayer-1.0rc2-dirac/configure --- MPlayer-1.0rc2/configure 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/configure 2008-01-10 12:24:53.000000000 +1100 @@ -313,6 +313,7 @@ --disable-libvorbis disable libvorbis support [autodetect] --- 1,5 ---- diff -ruN MPlayer-1.0rc2/configure MPlayer-1.0rc2-dirac/configure --- MPlayer-1.0rc2/configure 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/configure 2008-01-26 14:34:40.000000000 +1100 @@ -313,6 +313,7 @@ --disable-libvorbis disable libvorbis support [autodetect] *************** *** 120,124 **** diff -ruN MPlayer-1.0rc2/etc/codecs.conf MPlayer-1.0rc2-dirac/etc/codecs.conf --- MPlayer-1.0rc2/etc/codecs.conf 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/etc/codecs.conf 2008-01-10 11:11:37.000000000 +1100 @@ -326,6 +326,16 @@ dll libtheora --- 120,124 ---- diff -ruN MPlayer-1.0rc2/etc/codecs.conf MPlayer-1.0rc2-dirac/etc/codecs.conf --- MPlayer-1.0rc2/etc/codecs.conf 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/etc/codecs.conf 2008-01-26 14:34:40.000000000 +1100 @@ -326,6 +326,16 @@ dll libtheora *************** *** 140,144 **** diff -ruN MPlayer-1.0rc2/libmpcodecs/Makefile MPlayer-1.0rc2-dirac/libmpcodecs/Makefile --- MPlayer-1.0rc2/libmpcodecs/Makefile 2007-10-08 05:49:25.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpcodecs/Makefile 2008-01-10 12:21:51.000000000 +1100 @@ -110,6 +110,7 @@ SRCS_COMMON-$(LIBA52) += ad_liba52.c --- 140,144 ---- diff -ruN MPlayer-1.0rc2/libmpcodecs/Makefile MPlayer-1.0rc2-dirac/libmpcodecs/Makefile --- MPlayer-1.0rc2/libmpcodecs/Makefile 2007-10-08 05:49:25.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpcodecs/Makefile 2008-01-26 14:34:40.000000000 +1100 @@ -110,6 +110,7 @@ SRCS_COMMON-$(LIBA52) += ad_liba52.c *************** *** 151,155 **** diff -ruN MPlayer-1.0rc2/libmpcodecs/vd.c MPlayer-1.0rc2-dirac/libmpcodecs/vd.c --- MPlayer-1.0rc2/libmpcodecs/vd.c 2007-10-08 05:49:25.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpcodecs/vd.c 2008-01-10 11:11:37.000000000 +1100 @@ -50,6 +50,7 @@ extern vd_functions_t mpcodecs_vd_libdv; --- 151,155 ---- diff -ruN MPlayer-1.0rc2/libmpcodecs/vd.c MPlayer-1.0rc2-dirac/libmpcodecs/vd.c --- MPlayer-1.0rc2/libmpcodecs/vd.c 2007-10-08 05:49:25.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpcodecs/vd.c 2008-01-26 14:34:40.000000000 +1100 @@ -50,6 +50,7 @@ extern vd_functions_t mpcodecs_vd_libdv; *************** *** 172,176 **** diff -ruN MPlayer-1.0rc2/libmpcodecs/vd_dirac.c MPlayer-1.0rc2-dirac/libmpcodecs/vd_dirac.c --- MPlayer-1.0rc2/libmpcodecs/vd_dirac.c 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpcodecs/vd_dirac.c 2008-01-15 10:50:50.000000000 +1100 @@ -0,0 +1,176 @@ +#include <stdio.h> --- 172,176 ---- diff -ruN MPlayer-1.0rc2/libmpcodecs/vd_dirac.c MPlayer-1.0rc2-dirac/libmpcodecs/vd_dirac.c --- MPlayer-1.0rc2/libmpcodecs/vd_dirac.c 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpcodecs/vd_dirac.c 2008-01-26 14:34:40.000000000 +1100 @@ -0,0 +1,176 @@ +#include <stdio.h> *************** *** 352,356 **** diff -ruN MPlayer-1.0rc2/libmpdemux/demux_dirac.c MPlayer-1.0rc2-dirac/libmpdemux/demux_dirac.c --- MPlayer-1.0rc2/libmpdemux/demux_dirac.c 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/demux_dirac.c 2008-01-10 13:18:46.000000000 +1100 @@ -0,0 +1,170 @@ +#include <stdio.h> --- 352,356 ---- diff -ruN MPlayer-1.0rc2/libmpdemux/demux_dirac.c MPlayer-1.0rc2-dirac/libmpdemux/demux_dirac.c --- MPlayer-1.0rc2/libmpdemux/demux_dirac.c 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/demux_dirac.c 2008-01-26 14:35:37.000000000 +1100 @@ -0,0 +1,170 @@ +#include <stdio.h> *************** *** 515,520 **** + "", + DEMUXER_TYPE_DIRAC, ! + 1, ! + dirac_check_file, + demux_dirac_fill_buffer, + demux_open_dirac, --- 515,520 ---- + "", + DEMUXER_TYPE_DIRAC, ! + 0, ! + NULL, + demux_dirac_fill_buffer, + demux_open_dirac, *************** *** 526,530 **** diff -ruN MPlayer-1.0rc2/libmpdemux/demuxer.c MPlayer-1.0rc2-dirac/libmpdemux/demuxer.c --- MPlayer-1.0rc2/libmpdemux/demuxer.c 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/demuxer.c 2008-01-10 11:11:37.000000000 +1100 @@ -67,6 +67,8 @@ extern demuxer_desc_t demuxer_desc_lavf_preferred; --- 526,530 ---- diff -ruN MPlayer-1.0rc2/libmpdemux/demuxer.c MPlayer-1.0rc2-dirac/libmpdemux/demuxer.c --- MPlayer-1.0rc2/libmpdemux/demuxer.c 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/demuxer.c 2008-01-26 14:34:40.000000000 +1100 @@ -67,6 +67,8 @@ extern demuxer_desc_t demuxer_desc_lavf_preferred; *************** *** 548,552 **** diff -ruN MPlayer-1.0rc2/libmpdemux/demuxer.h MPlayer-1.0rc2-dirac/libmpdemux/demuxer.h --- MPlayer-1.0rc2/libmpdemux/demuxer.h 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/demuxer.h 2008-01-10 12:08:10.000000000 +1100 @@ -56,11 +56,12 @@ #define DEMUXER_TYPE_MPEG_GXF 42 --- 548,552 ---- diff -ruN MPlayer-1.0rc2/libmpdemux/demuxer.h MPlayer-1.0rc2-dirac/libmpdemux/demuxer.h --- MPlayer-1.0rc2/libmpdemux/demuxer.h 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/demuxer.h 2008-01-26 14:34:40.000000000 +1100 @@ -56,11 +56,12 @@ #define DEMUXER_TYPE_MPEG_GXF 42 *************** *** 563,569 **** #define DEMUXER_TYPE_DEMUXERS (1<<16) // A virtual demuxer type for the network code diff -ruN MPlayer-1.0rc2/libmpdemux/Makefile MPlayer-1.0rc2-dirac/libmpdemux/Makefile --- MPlayer-1.0rc2/libmpdemux/Makefile 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/Makefile 2008-01-10 12:06:32.000000000 +1100 @@ -51,6 +51,7 @@ SRCS_COMMON-$(LIBNEMESI) += demux_nemesi.c --- 563,580 ---- #define DEMUXER_TYPE_DEMUXERS (1<<16) // A virtual demuxer type for the network code + diff -ruN MPlayer-1.0rc2/libmpdemux/extension.c MPlayer-1.0rc2-dirac/libmpdemux/extension.c + --- MPlayer-1.0rc2/libmpdemux/extension.c 2007-10-08 05:49:33.000000000 +1000 + +++ MPlayer-1.0rc2-dirac/libmpdemux/extension.c 2008-01-26 14:35:12.000000000 +1100 + @@ -62,6 +62,7 @@ + { "ape", DEMUXER_TYPE_LAVF }, + { "apl", DEMUXER_TYPE_LAVF }, + { "mac", DEMUXER_TYPE_LAVF }, + + { "drc", DEMUXER_TYPE_DIRAC }, + + // At least the following are hacks against broken autodetection + // that should not be there diff -ruN MPlayer-1.0rc2/libmpdemux/Makefile MPlayer-1.0rc2-dirac/libmpdemux/Makefile --- MPlayer-1.0rc2/libmpdemux/Makefile 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/Makefile 2008-01-26 14:34:40.000000000 +1100 @@ -51,6 +51,7 @@ SRCS_COMMON-$(LIBNEMESI) += demux_nemesi.c *************** *** 576,581 **** diff -ruN MPlayer-1.0rc2/libmpdemux/parse_dirac.c MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.c --- MPlayer-1.0rc2/libmpdemux/parse_dirac.c 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.c 2008-01-10 13:19:26.000000000 +1100 ! @@ -0,0 +1,154 @@ +#include <stdio.h> +#include <stdlib.h> --- 587,592 ---- diff -ruN MPlayer-1.0rc2/libmpdemux/parse_dirac.c MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.c --- MPlayer-1.0rc2/libmpdemux/parse_dirac.c 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.c 2008-01-26 16:04:02.000000000 +1100 ! @@ -0,0 +1,162 @@ +#include <stdio.h> +#include <stdlib.h> *************** *** 628,640 **** +} + ! +// Access unit header = 0x00 ! +// Intra_Ref start = 0x0C ! +// Intra_NonRef start = 0x08 ! +// Inter_Ref_1Ref start = 0x0D ! +// Inter_Ref_2Ref start = 0x0E ! +// Inter_NonRef_1Ref start = 0x09 ! +// Inter_NonRef_2Ref start = 0x0A ! +// End of sequence = 0x10 ! +#define FRAME_START(c) ((c) == 0x00 || (c) == 0x0C || (c) == 0x08 || (c) == 0x0D || (c) == 0x0E || (c) == 0x09 || (c) == 0x0A || (c) == 0x10) + +int dirac_read_video_frame (demux_stream_t *ds, unsigned char** start) --- 639,659 ---- +} + ! +/* ! +* Access unit header = 0x00 ! +* End of sequence = 0x10 ! +* Auxiliary data = 0x20 ! +* Padding data = 0x30 ! +* Intra_Ref start = 0x0C (using ac) ! +* Intra_NonRef start = 0x08 (using ac) ! +* Intra_Ref start = 0x4C (not using ac) ! +* Intra_NonRef start = 0x48 (not using ac) ! +* Intra_Ref start = 0xCC (low delay syntax) ! +* Intra_NonRef start = 0xC8 (low delay syntax) ! +* Inter_Ref_1Ref start = 0x0D ! +* Inter_Ref_2Ref start = 0x0E ! +* Inter_NonRef_1Ref start = 0x09 ! +* Inter_NonRef_2Ref start = 0x0A ! +*/ ! +#define FRAME_START(c) (((c) == 0x00) || ((c) == 0x10) || (((c)&0xF8) == 0x20) || ((c) == 0x30) || (((c)&0x08) == 0x08)) + +int dirac_read_video_frame (demux_stream_t *ds, unsigned char** start) *************** *** 734,738 **** diff -ruN MPlayer-1.0rc2/libmpdemux/parse_dirac.h MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.h --- MPlayer-1.0rc2/libmpdemux/parse_dirac.h 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.h 2008-01-10 11:11:37.000000000 +1100 @@ -0,0 +1,10 @@ + --- 753,757 ---- diff -ruN MPlayer-1.0rc2/libmpdemux/parse_dirac.h MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.h --- MPlayer-1.0rc2/libmpdemux/parse_dirac.h 1970-01-01 10:00:00.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/parse_dirac.h 2008-01-26 14:34:40.000000000 +1100 @@ -0,0 +1,10 @@ + *************** *** 748,752 **** diff -ruN MPlayer-1.0rc2/libmpdemux/video.c MPlayer-1.0rc2-dirac/libmpdemux/video.c --- MPlayer-1.0rc2/libmpdemux/video.c 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/video.c 2008-01-10 12:59:44.000000000 +1100 @@ -17,6 +17,7 @@ #include "demuxer.h" --- 767,771 ---- diff -ruN MPlayer-1.0rc2/libmpdemux/video.c MPlayer-1.0rc2-dirac/libmpdemux/video.c --- MPlayer-1.0rc2/libmpdemux/video.c 2007-10-08 05:49:33.000000000 +1000 ! +++ MPlayer-1.0rc2-dirac/libmpdemux/video.c 2008-01-26 14:34:40.000000000 +1100 @@ -17,6 +17,7 @@ #include "demuxer.h" |