ffmpeg issue #1709

SOliver · 19. April 2010

DVDAudioCodecFFmpeg.cpp:162:4: error: #error Make sure upstream version still needs this workaround (ffmpeg issue #1709)

weiss zufällig wer, was man hiergegen tun kann?

ffmpeg ist svn vom 18.04.2010 und xbmc-pvr-testing2 vom 19.04.2010 ausgecheckt.

und hier nochmal zeile 161-163 aus der ./xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp

Zitat

#if (LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 59, 0))
#error Make sure upstream version still needs this workaround (ffmpeg issue #1709)
#endif

hal2050 · 21. April 2010

konntest du einen workaround finden? habe tagen das selbe fehlerbild. allerdings nutze ich derzeit den normalen trunk. im xbmc forum findet man ebenfalls nichts dazu.

habe bereits folgendes versucht:
- internal und external ffmpeg
- externe ffmpeg versionen: 0.5-r1, 0.5_p22846, svn heute ausgecheckt

fehlermeldung:

Code

DVDAudioCodecFFmpeg.cpp:162:4: error: #error Make sure upstream version still needs this workaround (ffmpeg issue #1709) 
make[1]: *** [DVDAudioCodecFFmpeg.o] Error 1 
make: *** [xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a] Error 2

SOliver · 22. April 2010

jop habe ich, habe die zeilen einfach entfernt, baut nun durch und sehe kein problem damit, avi und mpeg videos getestet und tut 1a.

hier mal nen patch dazu

Diff

diff -Naur xbmc-pre10.05+pvr-testing2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp xbmc-pre10.05+pvr-testing2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
--- xbmc-pre10.05+pvr-testing2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp	2010-04-19 02:44:43.000000000 +0200
+++ xbmc-pre10.05+pvr-testing2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp	2010-04-20 02:01:54.000000000 +0200
@@ -158,9 +158,6 @@
                                                  , pData
                                                  , iSize);
 
-#if (LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 59, 0))
-  #error Make sure upstream version still needs this workaround (ffmpeg issue #1709)
-#endif
   /* upstream ac3dec is bugged, returns the packet size, not a negative value on error */
   if (m_pCodecContext->codec_id == CODEC_ID_AC3 && iBytesUsed > iSize)
   {
diff -Naur xbmc-pre10.05+pvr-testing2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp xbmc-pre10.05+pvr-testing2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
--- xbmc-pre10.05+pvr-testing2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp	2010-04-19 02:44:43.000000000 +0200
+++ xbmc-pre10.05+pvr-testing2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp	2010-04-20 02:02:18.000000000 +0200
@@ -376,9 +376,6 @@
   if (!SetupMuxer(hints, "spdif", m_SPDIF))
     return false;
 
-#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 59, 0))
-  #error Make sure upstream FFmpeg still needs this workaround (issue #1735)
-#endif
   Reset();
 
   /* we will check the first packet's crc */

Alles anzeigen

hal2050 · 22. April 2010

ah fein, danke! werde ich nachher gleich mal testen. schreibe zu dem thema gerade einen beitrag im xbmc forum. werde mal auf deine idee/patch verweisen.

EDIT1: hier der link zum thread im xbmc forum: http://forum.xbmc.org/showthread.php?p=525846#post525846

EDIT2: ok patch hat funktioniert aber dafür klemmts nun an einer anderen stelle
http://pastebin.com/2UAb6yrm

EDIT3: elupus hat soeben im trunk rev 29430 den hack entfernt. somit sollte beim nächsten grösseren merge mit dem pvr2 branch das problem auch dort verschwinden.

SOliver · 22. April 2010

den fehler hab ich beim xbmc trunk nicht, aber nen vaapi prob, aber der pvr-testing2 branch in selber revision läuft 1a durch.

Code

/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -I/usr/include/lzo RenderManager.cpp -o RenderManager.o                                                                 
In file included from LinuxRendererGL.h:9,                                                                                                                                         
                 from RenderManager.h:25,                                                                                                                                          
                 from RenderManager.cpp:23:                                                                                                                                        
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::avcodec_decode_video(AVCodecContext*, AVFrame*, int*, uint8_t*, int)':                               
../dvdplayer/Codecs/DllAvCodec.h:134: warning: 'int avcodec_decode_video(AVCodecContext*, AVFrame*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3438)                                                                                                                                                                    
../dvdplayer/Codecs/DllAvCodec.h:134: warning: 'int avcodec_decode_video(AVCodecContext*, AVFrame*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3438)                                                                                                                                                                    
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::avcodec_decode_audio2(AVCodecContext*, int16_t*, int*, uint8_t*, int)':                              
../dvdplayer/Codecs/DllAvCodec.h:135: warning: 'int avcodec_decode_audio2(AVCodecContext*, int16_t*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3376)                                                                                                                                                                   
../dvdplayer/Codecs/DllAvCodec.h:135: warning: 'int avcodec_decode_audio2(AVCodecContext*, int16_t*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3376)                                                                                                                                                                   
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::avcodec_decode_subtitle(AVCodecContext*, AVSubtitle*, int*, const uint8_t*, int)':                   
../dvdplayer/Codecs/DllAvCodec.h:136: warning: 'int avcodec_decode_subtitle(AVCodecContext*, AVSubtitle*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3484)                                                                                                                                                              
../dvdplayer/Codecs/DllAvCodec.h:136: warning: 'int avcodec_decode_subtitle(AVCodecContext*, AVSubtitle*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3484)                                                                                                                                                              
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::av_parser_parse(AVCodecParserContext*, AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t)':                                                                                                                                                                       
../dvdplayer/Codecs/DllAvCodec.h:146: warning: 'int av_parser_parse(AVCodecParserContext*, AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3737)                                                                                                                               
../dvdplayer/Codecs/DllAvCodec.h:146: warning: 'int av_parser_parse(AVCodecParserContext*, AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3737)                                                                                                                               
x86_64-linux-gnu-g++ -MD -c -O2 -O2 -g -D_DEBUG -Wall -O2 -g -D_DEBUG -Wall -D_LINUX -D_FILE_DEFINED -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DINSTALL_PATH="\"/usr/share/xbmc\"" -DHAS_SDL_JOYSTICK -D'SVN_REV="29376"' -DHAVE_CONFIG_H  -I../../.. -I. -I.. -I../../ -I../../../ -I../../linux -I../../../guilib -I../../utils -I../dvdplayer -I/linux/repository/dists/squeeze/x86_64/xbmc/debian/xbmc-pre10.05     -I/usr/include/fribidi     -I/usr/include/libpng12           -I/usr/include/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/freetype2         -I/usr/include/mysql -I/usr/include/alsa                 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL   -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -I/usr/include/lzo LinuxRendererGL.cpp -o LinuxRendererGL.o
In file included from LinuxRendererGL.h:9,
                 from LinuxRendererGL.cpp:30:
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::avcodec_decode_video(AVCodecContext*, AVFrame*, int*, uint8_t*, int)':
../dvdplayer/Codecs/DllAvCodec.h:134: warning: 'int avcodec_decode_video(AVCodecContext*, AVFrame*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3438)
../dvdplayer/Codecs/DllAvCodec.h:134: warning: 'int avcodec_decode_video(AVCodecContext*, AVFrame*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3438)
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::avcodec_decode_audio2(AVCodecContext*, int16_t*, int*, uint8_t*, int)':
../dvdplayer/Codecs/DllAvCodec.h:135: warning: 'int avcodec_decode_audio2(AVCodecContext*, int16_t*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3376)
../dvdplayer/Codecs/DllAvCodec.h:135: warning: 'int avcodec_decode_audio2(AVCodecContext*, int16_t*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3376)
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::avcodec_decode_subtitle(AVCodecContext*, AVSubtitle*, int*, const uint8_t*, int)':
../dvdplayer/Codecs/DllAvCodec.h:136: warning: 'int avcodec_decode_subtitle(AVCodecContext*, AVSubtitle*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3484)
../dvdplayer/Codecs/DllAvCodec.h:136: warning: 'int avcodec_decode_subtitle(AVCodecContext*, AVSubtitle*, int*, const uint8_t*, int)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3484)
../dvdplayer/Codecs/DllAvCodec.h: In member function 'virtual int DllAvCodec::av_parser_parse(AVCodecParserContext*, AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t)':
../dvdplayer/Codecs/DllAvCodec.h:146: warning: 'int av_parser_parse(AVCodecParserContext*, AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3737)
../dvdplayer/Codecs/DllAvCodec.h:146: warning: 'int av_parser_parse(AVCodecParserContext*, AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t)' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3737)
In file included from ../../cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h:26,
                 from ../../cores/dvdplayer/DVDCodecs/Video/VDPAU.h:25,
                 from LinuxRendererGL.cpp:43:
../dvdplayer/Codecs/DllAvFormat.h: In member function 'virtual AVOutputFormat* DllAvFormat::guess_format(const char*, const char*, const char*)':
../dvdplayer/Codecs/DllAvFormat.h:139: warning: 'AVOutputFormat* guess_format(const char*, const char*, const char*)' is deprecated (declared at /usr/include/libavformat/avformat.h:785)
../dvdplayer/Codecs/DllAvFormat.h:139: warning: 'AVOutputFormat* guess_format(const char*, const char*, const char*)' is deprecated (declared at /usr/include/libavformat/avformat.h:785)
LinuxRendererGL.cpp: In member function 'void CLinuxRendererGL::RenderVAAPI(int, int)':
LinuxRendererGL.cpp:1740: error: cannot convert 'VAAPI::CSurfaceGLPtr' to 'void*' for argument '2' to 'VAStatus vaEndRenderSurfaceGLX(void*, void*)'
make[2]: *** [LinuxRendererGL.o] Fehler 1
make[2]: Leaving directory `/linux/repository/dists/squeeze/x86_64/xbmc/debian/xbmc-pre10.05/xbmc/cores/VideoRenderers'
make[1]: *** [xbmc/cores/VideoRenderers/VideoRenderer.a] Fehler 2
make[1]: Leaving directory `/linux/repository/dists/squeeze/x86_64/xbmc/debian/xbmc-pre10.05'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Fehler 2
dpkg-buildpackage: Fehler: debian/rules build gab Fehler-Exitstatus 2

Alles anzeigen

ist die r29376 vom xbmc trunk.

hal2050 · 22. April 2010

hehe ok. soweit komme ich bei r29376 (trunk) mit o.g. patch gar nicht. das bricht dann bereits vor configure ab.

ich vermute in meinem fall auch, dass es mit dem ebuild zusammenhängt. irgendwie ist das nicht astrein und auf dem gentoo bugtracker häufen sich die reports. aber da scheint zz nicht viel bewegung zu sein...
die letzte funktionierende revision ist 29060. alles danach bricht beim bauen ab.

EDIT: ok, nachdem ich nun mal auf verdacht meinen ccache und die svn working copy gelöscht und neu ausgecheckt habe funktioniert es wieder (doch kein problem mit dem ebuild). aktuell bin ich auf r29438 (trunk).
allerdings musste ich dennoch den ersten teil deines patch anwenden, da elupus nur den hack in DVDAudioCodecPassthroughFFmpeg.cpp, aber nicht in DVDAudioCodecFFmpeg.cpp entfernt hat. ich habe in dem xbmc thread nochmal nachgefragt.

hal2050 · 24. April 2010

problem gefixt in r29479. manuelles patchen nicht mehr nötig.

changeset

ffmpeg issue #1709

Jetzt mitmachen!

Teilen