Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
e5863339
Commit
e5863339
authored
Jun 21, 2008
by
Pavlov Konstantin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update dirac support to 0.10.0.
Require it in configure as well.
parent
4c270ec5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
36 deletions
+33
-36
configure.ac
configure.ac
+2
-2
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+2
-2
extras/contrib/src/Patches/dirac-cross.patch
extras/contrib/src/Patches/dirac-cross.patch
+25
-21
extras/contrib/src/packages.mak
extras/contrib/src/packages.mak
+1
-1
modules/codec/dirac.c
modules/codec/dirac.c
+3
-10
No files found.
configure.ac
View file @
e5863339
...
...
@@ -3571,11 +3571,11 @@ dnl
AC_ARG_ENABLE(dirac,
[ --enable-dirac experimental dirac codec (default disabled)])
if test "${enable_dirac}" = "yes"; then
PKG_CHECK_MODULES(DIRAC,[dirac >= 0.
9
.0], [
PKG_CHECK_MODULES(DIRAC,[dirac >= 0.
10
.0], [
VLC_ADD_PLUGIN([dirac])
VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
AC_MSG_ERROR([libdirac
doesn't appear to be installed on you
system.])
AC_MSG_ERROR([libdirac
>= 0.10.0 doesn't appear to be installed on your
system.])
])
fi
...
...
extras/contrib/src/Makefile
View file @
e5863339
...
...
@@ -2184,12 +2184,12 @@ dirac-$(DIRAC_VERSION).tar.gz:
dirac
:
dirac-$(DIRAC_VERSION).tar.gz
$(EXTRACT_GZ)
patch
-p
0
<Patches/dirac-cross.patch
patch
-p
1
-d
dirac
<Patches/dirac-cross.patch
ifdef
HAVE_CYGWIN
# incorrect compile warning with cygwin compiler 3.4.4
patch
-p0
<Patches/dirac-cygwin.patch
endif
(
cd
$@
;
aclocal
&&
autoconf
&&
automake
)
(
cd
$@
;
aclocal
-I
m4
&&
autoconf
&&
automake
)
DIRAC_SUBDIRS
=
libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
...
...
extras/contrib/src/Patches/dirac-cross.patch
View file @
e5863339
diff -
ruN dirac-0.6.0.old/Makefile.am dirac-0.6.0
/Makefile.am
--- dirac/Makefile.am 2007-03-27 00:17:15.000000000 +0200
+++ dirac/Makefile.am 2007-03-27 00:18:31.000000000 +0200
@@ -2,17 +2,12 @@
#
diff -
-git a/Makefile.am b
/Makefile.am
index dfd6b87..e534452 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,17 +3,12 @@
SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder \
-encoder decoder util $(CPPUNITTESTS_DIR) tests $(DOC_DIR) win32
+encoder decoder util $(CPPUNITTESTS_DIR) win32
SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder \
libdirac_decoder encoder decoder util $(CPPUNITTESTS_DIR) \
- tests $(DOC_DIR) win32
+ win32
.PHONY: valgrind-check
valgrind-check:
...
...
@@ -20,10 +21,11 @@ diff -ruN dirac-0.6.0.old/Makefile.am dirac-0.6.0/Makefile.am
if HAVE_LATEX
DOC_DIR = doc
diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
--- dirac/configure.ac 2007-03-27 00:17:15.000000000 +0200
+++ dirac/configure.ac 2007-03-27 00:19:52.000000000 +0200
@@ -143,7 +143,7 @@
diff --git a/configure.ac b/configure.ac
index a4d0d84..975a83d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@
dnl Checks for optional files in doc directory.
dnl algorithm documentation is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
...
...
@@ -32,7 +34,7 @@ diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
AM_CONDITIONAL(HAVE_ALGO, $HAVE_ALGO)
dnl -----------------------------------------------
@@ -15
1,7 +151,7 @@
@@ -15
7,7 +157,7 @@
dnl Checks for optional files in doc directory.
dnl Enhancements is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
...
...
@@ -41,7 +43,7 @@ diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
AM_CONDITIONAL(HAVE_ENHANCE, $HAVE_ENHANCE)
dnl -----------------------------------------------
@@ -1
59,7 +159,7 @@
@@ -1
65,7 +165,7 @@
dnl Checks for optional files in doc directory.
dnl Global Motion documentation is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
...
...
@@ -50,7 +52,7 @@ diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
AM_CONDITIONAL(HAVE_GM, $HAVE_GM)
dnl -----------------------------------------------
@@ -1
67,7 +167,7 @@
@@ -1
73,7 +173,7 @@
dnl Checks for optional files in doc directory.
dnl Upconversion doc is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
...
...
@@ -59,7 +61,7 @@ diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
AM_CONDITIONAL(HAVE_UPCONV, $HAVE_UPCONV)
dnl -----------------------------------------------
@@ -1
75,7 +175,7 @@
@@ -1
81,7 +181,7 @@
dnl Checks for optional files in doc directory.
dnl programmer's guide is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
...
...
@@ -68,7 +70,7 @@ diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
AM_CONDITIONAL(HAVE_PROG, $HAVE_PROG)
dnl -----------------------------------------------
@@ -18
3,7 +183,7 @@
@@ -18
9,7 +189,7 @@
dnl Checks for optional files in doc directory.
dnl Diagnostics tools docs are is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
...
...
@@ -77,9 +79,11 @@ diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
AM_CONDITIONAL(HAVE_DIAG, $HAVE_DIAG)
dnl -----------------------------------------------
--- dirac/libdirac_common/band_codec.cpp 2007-07-06 23:20:51.000000000 +0200
+++ dirac/libdirac_common/band_codec.cpp 2007-03-27 18:29:13.000000000 +0200
@@ -433,7 +433,7 @@
diff --git a/libdirac_common/band_codec.cpp b/libdirac_common/band_codec.cpp
index f750906..bfe6e75 100644
--- a/libdirac_common/band_codec.cpp
+++ b/libdirac_common/band_codec.cpp
@@ -433,7 +433,7 @@
inline int BandCodec::ChooseFollowContext( const int bin_number ) const
}
}
...
...
@@ -87,4 +91,4 @@ diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
+ return 0; // avoid warning
}
inline int BandCodec::ChooseInfoContext() const
7
inline int BandCodec::ChooseInfoContext() const
extras/contrib/src/packages.mak
View file @
e5863339
...
...
@@ -194,7 +194,7 @@ ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
XML_VERSION
=
2.6.32
XML_URL
=
$(VIDEOLAN)
/testing/contrib/libxml2-
$(XML_VERSION)
.tar.gz
#XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
DIRAC_VERSION
=
0.
9.1
DIRAC_VERSION
=
0.
10.0
DIRAC_URL
=
$(SF)
/dirac/dirac-
$(DIRAC_VERSION)
.tar.gz
DX_HEADERS_URL
=
$(VIDEOLAN)
/testing/contrib/win32-dx7headers.tgz
DSHOW_HEADERS_URL
=
$(VIDEOLAN)
/contrib/dshow-headers.tgz
...
...
modules/codec/dirac.c
View file @
e5863339
...
...
@@ -275,16 +275,9 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
FreeFrameBuffer
(
p_sys
->
p_dirac
);
break
;
case
STATE_PICTURE_START
:
msg_Dbg
(
p_dec
,
"PICTURE_START: frame_type=%i frame_num=%d"
,
p_sys
->
p_dirac
->
frame_params
.
ftype
,
p_sys
->
p_dirac
->
frame_params
.
fnum
);
break
;
case
STATE_PICTURE_AVAIL
:
msg_Dbg
(
p_dec
,
"PICTURE_AVAI : frame_type=%i frame_num=%d"
,
p_sys
->
p_dirac
->
frame_params
.
ftype
,
p_sys
->
p_dirac
->
frame_params
.
fnum
);
msg_Dbg
(
p_dec
,
"PICTURE_AVAIL : frame_num=%d"
,
p_sys
->
p_dirac
->
frame_num
);
/* Picture available for display */
p_pic
=
GetNewPicture
(
p_dec
);
...
...
@@ -476,7 +469,7 @@ static void CloseEncoder( vlc_object_t *p_this )
encoder_t
*
p_enc
=
(
encoder_t
*
)
p_this
;
encoder_sys_t
*
p_sys
=
p_enc
->
p_sys
;
msg_Dbg
(
p_enc
,
"resulting bit-rate: %
i
bits/sec"
,
msg_Dbg
(
p_enc
,
"resulting bit-rate: %
lld
bits/sec"
,
p_sys
->
p_dirac
->
enc_seqstats
.
bit_rate
);
/* Free the encoder resources */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment