ebasov
/
vlc
forked from rpms/vlc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxul 1.9.1 fix and postproc backport

Browse Source
el8
Nicolas Chauvet 16 years ago
parent 7ad2d41df3
commit 67b25ab2b9
7 changed files with 455 additions and 27 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -1 +1,2 @@
vlc-0.9.8a.tar.bz2 vlc-0.9.8a.tar.bz2
vlc-0.9.9-git2009011313.tar.bz2

77
0001-Mozilla-SDK-libxul-1.9.1-preliminary-support.patch
Unescape View File

@ -0,0 +1,77 @@
From b7fc1a472af08965e62df22eeb740d67970c78e1 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart@gmail.com>
Date: Tue, 13 Jan 2009 18:51:01 +0100
Subject: [PATCH] Mozilla SDK libxul 1.9.1 - preliminary support
According to https://bugzilla.mozilla.org/show_bug.cgi?id=455458
npupp.h has been renamed to npfunctions.h with libxul 1.9.1
---
configure.ac | 1 +
projects/mozilla/support/npmac.cpp | 4 ++++
projects/mozilla/support/npunix.c | 4 ++++
projects/mozilla/support/npwin.cpp | 4 ++++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index ec2284e..5bd1e9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5509,6 +5509,7 @@ then
AS_IF( [test $found = 1],[
CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
MOZILLA_REQUIRED_HEADERS=1
+ AC_CHECK_HEADERS([npfunctions.h])
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
diff --git a/projects/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp
index ccc3945..394c4c9 100644
--- a/projects/mozilla/support/npmac.cpp
+++ b/projects/mozilla/support/npmac.cpp
@@ -54,7 +54,11 @@
#undef XP_UNIX
#endif
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
#include "npupp.h"
+#endif
#ifdef __MWERKS__
#ifndef powerc
diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
index 26c6736..573f1f9 100644
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
@@ -43,7 +43,11 @@
#include <stdio.h>
#include <npapi.h>
+#ifdef HAVE_NPFUNCTIONS_H
+#include <npfunctions.h>
+#else
#include <npupp.h>
+#endif
/*
* Define PLUGIN_TRACE to have the wrapper functions print
diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
index c277f84..d9a0a9c 100644
--- a/projects/mozilla/support/npwin.cpp
+++ b/projects/mozilla/support/npwin.cpp
@@ -42,7 +42,11 @@
#endif
#include "npapi.h"
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
#include "npupp.h"
+#endif
//\\// DEFINE
#define NP_EXPORT
--
1.6.0.6

39
0002-Fix-the-config.h-reference-that-was-only-present-in.patch
Unescape View File

@ -0,0 +1,39 @@
From 2554044286d3697dcf1679f6e34413b9e7988066 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart@gmail.com>
Date: Fri, 16 Jan 2009 02:56:30 +0100
Subject: [PATCH] Fix the config.h reference that was only present in npwin.cpp
---
projects/mozilla/support/npmac.cpp | 2 ++
projects/mozilla/support/npunix.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/projects/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp
index 394c4c9..d5901bf 100644
--- a/projects/mozilla/support/npmac.cpp
+++ b/projects/mozilla/support/npmac.cpp
@@ -4,6 +4,8 @@
//
//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+#include "config.h"
+
#include <string.h>
#include <Processes.h>
diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
index 573f1f9..59de292 100644
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
@@ -38,6 +38,8 @@
*----------------------------------------------------------------------
*/
+#include "config.h"
+
#define XP_UNIX 1
#define OJI 1
--
1.6.0.6

1
sources
Unescape View File

@ -1 +1,2 @@
8ffa2ff763badd5de7592004d8d69a63 vlc-0.9.8a.tar.bz2 8ffa2ff763badd5de7592004d8d69a63 vlc-0.9.8a.tar.bz2
ec6fb4e74389d3ca6b80b6a607b02a3f vlc-0.9.9-git2009011313.tar.bz2

316
vlc-backport-postproc_unif.patch
Unescape View File

@ -0,0 +1,316 @@
diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 74e0db1..dde9495 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -100,6 +100,9 @@ struct picture_t
bool b_progressive; /**< is it a progressive frame ? */
unsigned int i_nb_fields; /**< # of displayed fields */
bool b_top_field_first; /**< which field is first */
+ uint8_t *p_q; /**< quantification table */
+ int i_qstride; /**< quantification stride */
+ int i_qtype; /**< quantification style */
/**@}*/
/** The picture heap we are attached to */
@@ -158,6 +161,17 @@ static inline void picture_Release( picture_t *p_picture )
}
/**
+ * Cleanup quantization matrix data and set to 0
+ */
+static inline void picture_CleanupQuant( picture_t *p_pic )
+{
+ free( p_pic->p_q );
+ p_pic->p_q = NULL;
+ p_pic->i_qstride = 0;
+ p_pic->i_qtype = 0;
+}
+
+/**
* This function will copy all picture dynamic properties.
*/
static inline void picture_CopyProperties( picture_t *p_dst, const picture_t *p_src )
@@ -168,6 +182,8 @@ static inline void picture_CopyProperties( picture_t *p_dst, const picture_t *p_
p_dst->b_progressive = p_src->b_progressive;
p_dst->i_nb_fields = p_src->i_nb_fields;
p_dst->b_top_field_first = p_src->b_top_field_first;
+
+ /* FIXME: copy ->p_q and ->p_qstride */
}
/**
@@ -240,6 +256,11 @@ struct picture_heap_t
#define DISPLAYED_PICTURE 5 /* been displayed but is linked */
#define DESTROYED_PICTURE 6 /* allocated but no more used */
+/* Quantification type */
+#define QTYPE_MPEG1 0
+#define QTYPE_MPEG2 1
+#define QTYPE_H264 2
+
/*****************************************************************************
* Shortcuts to access image components
*****************************************************************************/
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 2baffa8..38d63d6 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -643,6 +643,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
/* Send decoded frame to vout */
if( p_sys->i_pts )
{
+ int i;
p_pic->date = p_sys->i_pts;
ffmpeg_NextPts( p_dec, p_block->i_rate );
@@ -658,6 +659,24 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
p_pic->b_progressive = !p_sys->p_ff_pic->interlaced_frame;
p_pic->b_top_field_first = p_sys->p_ff_pic->top_field_first;
+ p_pic->i_qstride = p_sys->p_ff_pic->qstride;
+ int i_mb_h = ( p_pic->format.i_height + 15 ) / 16;
+ p_pic->p_q = malloc( p_pic->i_qstride * i_mb_h );
+ memcpy( p_pic->p_q, p_sys->p_ff_pic->qscale_table,
+ p_pic->i_qstride * i_mb_h );
+ switch( p_sys->p_ff_pic->qscale_type )
+ {
+ case FF_QSCALE_TYPE_MPEG1:
+ p_pic->i_qtype = QTYPE_MPEG1;
+ break;
+ case FF_QSCALE_TYPE_MPEG2:
+ p_pic->i_qtype = QTYPE_MPEG2;
+ break;
+ case FF_QSCALE_TYPE_H264:
+ p_pic->i_qtype = QTYPE_H264;
+ break;
+ }
+
return p_pic;
}
else
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index cb1a988..3c3f2fd 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -198,14 +198,24 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object,
if( p_object )
{
- vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object,
- VLC_OBJECT_DECODER,
- FIND_PARENT );
- if( p_dec_obj )
+ /* p_object is the vout, so the decoder is our parent and the
+ * postproc filter one of the decoder's children */
+ vlc_object_t *p_dec = (vlc_object_t *)
+ vlc_object_find( p_object, VLC_OBJECT_DECODER,
+ FIND_PARENT );
+ if( p_dec )
{
- vlc_object_t *p_object = p_dec_obj;
- PUSH_VAR( "ffmpeg-pp-q" );
- vlc_object_release( p_dec_obj );
+ vlc_object_t *p_pp = (vlc_object_t *)
+ vlc_object_find_name( p_dec, "postproc",
+ FIND_CHILD );
+ if( p_pp )
+ {
+ p_object = p_pp;
+ PUSH_VAR( "postproc-q" );
+ vlc_object_release( p_pp );
+ }
+
+ vlc_object_release( p_dec );
}
}
return VLC_SUCCESS;
@@ -510,7 +520,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) );
#endif
ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
- /* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */
+ ACT_ADD( current, "postproc-q", qtr( "Post processing" ) );
}
p_input = THEMIM->getInput();
@@ -1059,7 +1069,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
/* Check the type of the object variable */
if( !strcmp( psz_var, "audio-es" )
- || !strcmp( psz_var, "video-es" ) )
+ || !strcmp( psz_var, "video-es" )
+ || !strcmp( psz_var, "postproc-q" ) )
i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE;
else
i_type = var_Type( p_object, psz_var );
diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index a28986c..c619b7f 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -90,6 +90,7 @@ static void ReleasePicture( picture_t *p_pic )
}
else
{
+ free( p_pic->p_q );
free( p_pic->p_data_orig );
free( p_pic );
}
diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 7290b60..6dc6232 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2269,6 +2269,7 @@ static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
VLC_UNUSED(p_this);
if( p_pic )
{
+ free( p_pic->p_q );
free( p_pic->p_data_orig );
free( p_pic->p_sys );
free( p_pic );
@@ -2280,6 +2281,7 @@ static void video_del_buffer_decoder( decoder_t *p_decoder, picture_t *p_pic )
VLC_UNUSED(p_decoder);
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
}
static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
@@ -2287,6 +2289,7 @@ static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
VLC_UNUSED(p_filter);
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
}
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index e05d773..2e1237d 100644
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -102,6 +102,8 @@ struct filter_sys_t
pp_context_t *pp_context; /* Never changes after init */
pp_mode_t *pp_mode; /* Set to NULL if post processing is disabled */
+ bool b_had_matrix; /* Set to true if previous pic had a quant matrix (used to prevent spamming warning messages */
+
vlc_mutex_t lock; /* Lock when using or changing pp_mode */
};
@@ -139,6 +141,7 @@ static int OpenPostproc( vlc_object_t *p_this )
{
case VLC_FOURCC('I','4','4','4'):
case VLC_FOURCC('J','4','4','4'):
+ /* case VLC_FOURCC('Y','U','V','A'): FIXME Should work but alpha plane needs to be copied manually and I'm kind of feeling too lazy to write the code to do that ATM (i_pitch vs i_visible_pitch...). */
i_flags |= PP_FORMAT_444;
break;
case VLC_FOURCC('I','4','2','2'):
@@ -152,7 +155,6 @@ static int OpenPostproc( vlc_object_t *p_this )
case VLC_FOURCC('I','Y','U','V'):
case VLC_FOURCC('J','4','2','0'):
case VLC_FOURCC('Y','V','1','2'):
- /* case VLC_FOURCC('Y','U','V','A'): FIXME Should work but alpha plane needs to be copied manually and I'm kind of feeling too lazy to write the code to do that ATM (i_pitch vs i_visible_pitch...). */
i_flags |= PP_FORMAT_420;
break;
default:
@@ -238,6 +240,7 @@ static int OpenPostproc( vlc_object_t *p_this )
vlc_mutex_init( &p_sys->lock );
p_filter->pf_video_filter = PostprocPict;
+ p_sys->b_had_matrix = true;
return VLC_SUCCESS;
}
@@ -293,13 +296,22 @@ static picture_t *PostprocPict( filter_t *p_filter, picture_t *p_pic )
i_dst_stride[i_plane] = p_outpic->p[i_plane].i_pitch;
}
+ if( !p_pic->p_q && p_sys->b_had_matrix )
+ {
+ msg_Warn( p_filter, "Quantification table was not set by video decoder. Postprocessing won't look good." );
+ p_sys->b_had_matrix = false;
+ }
+ else if( p_pic->p_q )
+ {
+ p_sys->b_had_matrix = true;
+ }
+
pp_postprocess( src, i_src_stride, dst, i_dst_stride,
p_filter->fmt_in.video.i_width,
p_filter->fmt_in.video.i_height,
- NULL /* FIXME ? works by selecting a default table. But maybe setting our own might help improve post processing quality ... */,
- 0 /* FIXME */,
+ p_pic->p_q, p_pic->i_qstride,
p_sys->pp_mode, p_sys->pp_context,
- PP_PICT_TYPE_QP2 /* FIXME ? This should be set only for mpeg2 type codecs if I understand correctly. */ );
+ p_pic->i_qtype == QTYPE_MPEG2 ? PP_PICT_TYPE_QP2 : 0 );
vlc_mutex_unlock( &p_sys->lock );
return CopyInfoAndRelease( p_outpic, p_pic );
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 0e30948..4977ddd 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -712,6 +712,7 @@ static void VoutDisplayedPicture( vout_thread_t *p_vout, picture_t *p_pic )
else
{
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
p_vout->i_heap_size--;
}
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index b41aad2..a616d9c 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1327,6 +1327,7 @@ static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture )
/* Destroy the picture without displaying it */
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
+ picture_CleanupQuant( p_picture );
}
vlc_mutex_unlock( &p_vout->picture_lock );
}
diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 6c2e807..d90a3fb 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -262,6 +262,7 @@ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
+ picture_CleanupQuant( p_pic );
vlc_mutex_unlock( &p_vout->picture_lock );
}
@@ -294,6 +295,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
+ picture_CleanupQuant( p_pic );
}
vlc_mutex_unlock( &p_vout->picture_lock );
@@ -683,6 +685,10 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
p_pic->pf_unlock = 0;
p_pic->i_refcount = 0;
+ p_pic->p_q = NULL;
+ p_pic->i_qstride = 0;
+ p_pic->i_qtype = 0;
+
vout_InitFormat( &p_pic->format, i_chroma, i_width, i_height, i_aspect );
/* Make sure the real dimensions are a multiple of 16 */
@@ -1042,6 +1048,7 @@ void picture_Delete( picture_t *p_picture )
{
assert( p_picture && p_picture->i_refcount == 0 );
+ free( p_picture->p_q );
free( p_picture->p_data_orig );
free( p_picture->p_sys );
free( p_picture );
@@ -1094,4 +1101,3 @@ void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src )
*
*****************************************************************************/
-

22
vlc-embeddedvideo.patch
Unescape View File

@ -1,22 +0,0 @@
Re-enable the embedded video; Patch ported from this commit:
commit 9c26b8e2a04468aa4b4a158f072d760a991932db
Author: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Thu Oct 9 23:06:21 2008 +0300
Enable embedded video with Qt >= 4.3 - hopefully fixes #2136
Index: vlc-0.9.4/modules/gui/qt4/qt4.cpp
===================================================================
--- vlc-0.9.4.orig/modules/gui/qt4/qt4.cpp
+++ vlc-0.9.4/modules/gui/qt4/qt4.cpp
@@ -213,7 +213,7 @@ vlc_module_begin();
set_callbacks( OpenDialogs, Close );
-#ifdef WIN32
+#if !defined (Q_WS_X11) || HAS_QT43
add_submodule();
set_capability( "vout window", 50 );
set_callbacks( WindowOpen, WindowClose );

26
vlc.spec
Unescape View File

@ -5,7 +5,7 @@
%define live555_date 2008.07.25 %define live555_date 2008.07.25
%define vlc_git 0 %define vlc_git 0
%define vlc_date 20080915 %define vlc_date 20080915
%define with_mozilla 0 %define with_mozilla 1
%define with_dc1394 0 %define with_dc1394 0
%define with_directfb 1 %define with_directfb 1
@ -19,7 +19,7 @@ Version: 1.0.0
%else %else
Version: 0.9.8a Version: 0.9.8a
%define _version %{version} %define _version %{version}
%define release_tag 2 %define release_tag 3
%endif %endif
Release: %{release_tag}%{?dist} Release: %{release_tag}%{?dist}
License: GPLv2+ License: GPLv2+
@ -39,10 +39,14 @@ Patch2: vlc-0.9.8a-embeddedvideo.patch
Patch3: 300_all_pic.patch Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch Patch4: 310_all_mmx_pic.patch
Patch5: vlc-pulse0071.patch Patch5: vlc-pulse0071.patch
Patch6: 0001-Mozilla-SDK-libxul-1.9.1-preliminary-support.patch
Patch7: 0002-Fix-the-config.h-reference-that-was-only-present-in.patch
Patch8: vlc-backport-postproc_unif.patch
Patch9: vlc-0.9.9-git2009011313.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
%if 0 %if 1
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: libtool BuildRequires: libtool
%endif %endif
@ -271,9 +275,16 @@ VLC plugins for libdc1394
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic %patch4 -p1 -b .mmx_pic
%patch5 -p1 -b .pulse0071 %patch5 -p1 -b .pulse0071
%patch6 -p1 -b .libxul191
%patch7 -p1 -b .config_h
%patch8 -p1 -b .postproc
%patch9 -p1 -b .vlc099
chmod -x modules/gui/qt4/qt4* #chmod -x modules/gui/qt4/qt4*
#./bootstrap #./bootstrap
autoreconf
libtoolize
%build %build
@ -287,7 +298,7 @@ pushd live
popd popd
%endif %endif
export MOZILLA_CFLAGS="$(pkg-config --cflags libxul) -DHAVE_NPFUNCTIONS_H"
%configure \ %configure \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-rpath \ --disable-rpath \
@ -541,6 +552,11 @@ fi || :
%changelog %changelog
* Fri Jan 16 2009 kwizart < kwizart at gmail.com > - 0.9.8a-3
- Add libxul 1.9.1 prelimary support
- backport postproc fixes
- Add pending 0.9-bugfix git branch
* Thu Jan 15 2009 kwizart < kwizart at gmail.com > - 0.9.8a-2 * Thu Jan 15 2009 kwizart < kwizart at gmail.com > - 0.9.8a-2
- Disable mozilla-vlc because of libxul 1.9.1 WIP - Disable mozilla-vlc because of libxul 1.9.1 WIP
- Rebuild for libcdio - Rebuild for libcdio

Write Preview
Loading…
Cancel
Save