Attachment #373476 for bug #505196




INCLUDE(CheckIncludeFiles)
INCLUDE(FindLibMpeg2)
INCLUDE(FindXine)
INCLUDE(FindAvcodec)
INCLUDE(FindAvformat)
INCLUDE(FindFFmpegScale)
INCLUDE(FindLibDvdread)

INCLUDE(FindPkgConfig OPTIONAL)
pkg_check_modules(LIBAV REQUIRED libavformat libavcodec libavutil libswscale)

set (VERSION 2.3.8)


  FIND_LIBRARY(LIBDL_LIBRARY NAMES "c" PATHS )
  MESSAGE(STATUS "Found library libc: ${LIBDL_LIBRARY}")
ENDIF (LIBDL_LIBRARY)
FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread")


FINDAVFORMAT("avformat")
FINDAVCODEC("avcodec")

add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
add_subdirectory( src/dvdnav)
add_subdirectory( src/core )
add_subdirectory( src/mpeg2)
add_subdirectory(src/vamps)

add_subdirectory(doc)

include_directories(
 ${CMAKE_CURRENT_SOURCE_DIR}/src/dvdnav
 ${CMAKE_CURRENT_SOURCE_DIR}/src/devices
 ${CMAKE_CURRENT_SOURCE_DIR}/src/core
 ${CMAKE_CURRENT_SOURCE_DIR}/src/vamps

 ${CMAKE_CURRENT_SOURCE_DIR}/src/import
 ${CMAKE_CURRENT_SOURCE_DIR}/src/player
 ${CMAKE_CURRENT_SOURCE_DIR}/src/subtitles
 ${CMAKE_CURRENT_SOURCE_DIR}/src/dvdread
 ${CMAKE_CURRENT_SOURCE_DIR}/src/batch
${KDE4_INCLUDES} ${QT_INCLUDES}
${LIBDVDREAD_INCLUDE_DIR}/dvdread
${LIBDVDREAD_INCLUDE_DIR}/dvdnav
 ${AVCODEC_INCLUDE_DIR}
 ${AVFORMAT_INCLUDE_DIR}
 ${FFMPEGSCALE_INCLUDE_DIR}

   src/subtitles/k9subtitle2pgm.cpp
)

set (libdvdnav_SRCS
   src/dvdnav/decoder.c
   src/dvdnav/dvdnav.c
   src/dvdnav/highlight.c
   src/dvdnav/navigation.c
   src/dvdnav/read_cache.c
   src/dvdnav/remap.c
   src/dvdnav/searching.c
   src/dvdnav/settings.c
   src/dvdnav/vm.c
   src/dvdnav/vmcmd.c
)

set (vamps_SRCS
  src/vamps/k9fifo.cpp
  src/vamps/k9requant.cpp
  src/vamps/k9vamps.cpp
)

set (dvdread_SRCS
   src/dvdread/dvd_input.c
   src/dvdread/dvd_reader.c
   src/dvdread/dvd_udf.c
   src/dvdread/ifo_read.c
   src/dvdread/md5.c
   src/dvdread/nav_read.c
)


set (core_SRCS
  src/core/k9dvd.cpp

)

set (k9copylib_SRCS
   ${libdvdnav_SRCS}
   ${core_SRCS}
   ${vamps_SRCS}
   ${mpeg2_SRCS}
   ${subtitles_SRCS}
   ${dvdread_SRCS}
   ${backup_SRCS}
)




kde4_add_library(k9copylib STATIC ${k9copylib_SRCS})
target_link_libraries(k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS} ${KDE4_KIO_LIBS} ${LIBMPEG2_LIBRARY} ${LIBMPEG2CONVERT_LIBRARY} ${LIBDL_LIBRARY} ${LIBDVDREAD_LIBRARY} dvdnav)

kde4_add_ui_files(k9copy_SRCS )



 MESSAGE(STATUS "Found library solid: ${KDE4_SOLID_LIBS}")

target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${PHONON_LIBRARY} ${KDE4_SOLID_LIBS} ${LIBAV_LIBRARIES})
target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS}  )
target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${XINE_LIBRARY} ${X11_X11_LIB} )


Lines 72-78 Link Here

(-)k9copy-2.3.8-Source.orig/config.h (-1 / +1 lines)
72	/* #undef ADM_CPU_X86_64 */	72	/* #undef ADM_CPU_X86_64 */
73		73
74	/* ffmpeg with swscale support */	74	/* ffmpeg with swscale support */
75	/* #undef HAVE_SWSCALE */	75	#define HAVE_SWSCALE
76		76
77	/* opengl extensions available */	77	/* opengl extensions available */
78	/* #undef HAVE_OPENGL */	78	/* #undef HAVE_OPENGL */

Lines 18-24 Link Here

(-)k9copy-2.3.8-Source.orig/main.cpp (-1 / +4 lines)
18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	***************************************************************************/	19	***************************************************************************/
20		20
21	#include "src/dvdnav/common.h"	21	#include <ifo_types.h>
		22	#include <ifo_read.h>
		23	#include <nav_read.h>
		24	#include <nav_types.h>
22	#include "k9copy.h"	25	#include "k9copy.h"
23	#include "k9common.h"	26	#include "k9common.h"
24	#include <kapplication.h>	27	#include <kapplication.h>

Lines 23-29 Link Here

(-)k9copy-2.3.8-Source.orig/src/assistant/k9assistant.cpp (-1 / +4 lines)
23	#include "k9dvd.h"	23	#include "k9dvd.h"
24	#include "k9cddrive.h"	24	#include "k9cddrive.h"
25	#include "k9execcopy.h"	25	#include "k9execcopy.h"
26	#include "dvdread.h"	26	#include <ifo_types.h>
		27	#include <ifo_read.h>
		28	#include <nav_read.h>
		29	#include <nav_types.h>
27	#include "k9settings.h"	30	#include "k9settings.h"
28	#include "k9dvdtitle.h"	31	#include "k9dvdtitle.h"
29	k9Assistant *k9Assistant::createAssistant() {	32	k9Assistant *k9Assistant::createAssistant() {

Lines 40-46 Link Here

(-)k9copy-2.3.8-Source.orig/src/backup/k9dvdbackup.cpp (-1 / +4 lines)
40	#endif	40	#endif
41		41
42	#include "k9backupdlg.h"	42	#include "k9backupdlg.h"
43	#include "dvdread.h"	43	#include <ifo_types.h>
		44	#include <ifo_read.h>
		45	#include <nav_read.h>
		46	#include <nav_types.h>
44	#include "k9script.h"	47	#include "k9script.h"
45	#include "k9tools.h"	48	#include "k9tools.h"
46		49

Lines 619-625 Link Here

(-)k9copy-2.3.8-Source.orig/src/backup/k9mp4enc.cpp (-1 / +1 lines)
619	// cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";	619	// cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
620	}	620	}
621	//synchronize audio	621	//synchronize audio
622	cmd << "-async" << "1" ;	622	cmd << "-async" << "44100" ;
623	cmd << "-y" << KShell::quoteArg(path);	623	cmd << "-y" << KShell::quoteArg(path);
624	cmd << slNewAudio;	624	cmd << slNewAudio;
625	// if (m_extractMkv) {	625	// if (m_extractMkv) {

Lines 13-19 Link Here

(-)k9copy-2.3.8-Source.orig/src/backup/k9script.cpp (-1 / +4 lines)
13	#include "k9dvd.h"	13	#include "k9dvd.h"
14	#include "k9dvdtitle.h"	14	#include "k9dvdtitle.h"
15	#include "bswap.h"	15	#include "bswap.h"
16	#include "dvdread.h"	16	#include <ifo_types.h>
		17	#include <ifo_read.h>
		18	#include <nav_read.h>
		19	#include <nav_types.h>
17	#include <stdlib.h>	20	#include <stdlib.h>
18		21
19	k9Script::k9Script(ifo_handle_t _ifo, k9DVD _dvd ) {	22	k9Script::k9Script(ifo_handle_t _ifo, k9DVD _dvd ) {

Lines 35-41 Link Here

(-)k9copy-2.3.8-Source.orig/src/core/bswap.h (-1 / +1 lines)
35	#include <sys/param.h>	35	#include <sys/param.h>
36	#endif	36	#endif
37		37
38	#if defined(__linux__)	38	#if defined(__GLIBC__)
39	#include <byteswap.h>	39	#include <byteswap.h>
40	#define B2N_16(x) x = bswap_16(x)	40	#define B2N_16(x) x = bswap_16(x)
41	#define B2N_32(x) x = bswap_32(x)	41	#define B2N_32(x) x = bswap_32(x)

Lines 75-84 Link Here

(-)k9copy-2.3.8-Source.orig/src/core/k9audiocodecs.cpp (-4 / +4 lines)
75	m_codecs[4]=_k9AudioCodec("sonic","-oac lavc -lavcopts acodec=sonic:abitrate=$AUDBR","mencoder");	75	m_codecs[4]=_k9AudioCodec("sonic","-oac lavc -lavcopts acodec=sonic:abitrate=$AUDBR","mencoder");
76	m_codecs[5]=_k9AudioCodec("aac","-oac faac -faacopts br=$AUDBR","mencoder");	76	m_codecs[5]=_k9AudioCodec("aac","-oac faac -faacopts br=$AUDBR","mencoder");
77	m_codecs[6]=_k9AudioCodec("mp3 (lame)","-oac mp3lame -lameopts abr:br=$AUDBR","mencoder");	77	m_codecs[6]=_k9AudioCodec("mp3 (lame)","-oac mp3lame -lameopts abr:br=$AUDBR","mencoder");
78	m_codecs[7]=_k9AudioCodec("copy","-acodec copy","ffmpeg","");	78	m_codecs[7]=_k9AudioCodec("copy","-codec:a copy","ffmpeg","");
79	m_codecs[8]=_k9AudioCodec("mp3","-acodec libmp3lame -ab $AUDBRk -ac 2","ffmpeg",".mp3");	79	m_codecs[8]=_k9AudioCodec("mp3","-codec:a libmp3lame -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".mp3");
80	m_codecs[9]=_k9AudioCodec("vorbis","-acodec vorbis -ab $AUDBRk -ac 2","ffmpeg",".ogg");	80	m_codecs[9]=_k9AudioCodec("vorbis","-codec:a vorbis -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".ogg");
81	m_codecs[10]=_k9AudioCodec("aac","-acodec libfaac -ab $AUDBRk -ac 2","ffmpeg",".aac");	81	m_codecs[10]=_k9AudioCodec("aac","-codec:a libfaac -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".aac");
82		82
83	save();	83	save();
84	}	84	}

Lines 10-16 Link Here

(-)k9copy-2.3.8-Source.orig/src/core/k9dvdread.cpp (-1 / +4 lines)
10	//	10	//
11	//	11	//
12	#include "k9dvdread.h"	12	#include "k9dvdread.h"
13	#include "dvdread.h"	13	#include <ifo_types.h>
		14	#include <ifo_read.h>
		15	#include <nav_read.h>
		16	#include <nav_types.h>
14	#include "k9ifo2.h"	17	#include "k9ifo2.h"
15		18
16	k9DVDRead::k9DVDRead(){	19	k9DVDRead::k9DVDRead(){

Lines 19-25 Link Here

(-)k9copy-2.3.8-Source.orig/src/core/k9ifo2.cpp (-1 / +4 lines)
19	***************************************************************************/	19	***************************************************************************/
20	#include "k9ifo2.h"	20	#include "k9ifo2.h"
21	#include "bswap.h"	21	#include "bswap.h"
22	#include "dvdread.h"	22	#include <ifo_types.h>
		23	#include <ifo_read.h>
		24	#include <nav_read.h>
		25	#include <nav_types.h>
23	#include <QDebug>	26	#include <QDebug>
24		27
25	k9Ifo2::k9Ifo2(k9DVDRead *_dvdread) {	28	k9Ifo2::k9Ifo2(k9DVDRead *_dvdread) {




      m_codecs[18]=_k9VideoCodec("ASUS v1","","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
      m_codecs[19]=_k9VideoCodec("ASUS v2","","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
      m_codecs[20]=_k9VideoCodec("flv","","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
      m_codecs[21]=_k9VideoCodec("copy","","-codec:v copy","-codec:v copy","-codec:v copy","ffmpeg");
      m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
      m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
      m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4  -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
      m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
      m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");

      save();





//
//
#include "k9avidecode.h"
#include <avcodec.h>
#include <qimage.h>
#include <dlfcn.h>
#include "k9common.h"

#ifdef HAVE_SWSCALE

#include "swscale.h"

static int sws_flags = SWS_BICUBIC;

#endif


k9AviDecode::k9AviDecode(QObject *parent, const char *)
        : QObject(parent) {
    CodecHandle=0;
    FormatHandle=0;
    SwscaleHandle=0;
    glibref=0;
    if (glibref==0) {
        CodecHandle=dlopen("libavcodec.so",RTLD_LAZY ); //| RTLD_GLOBAL
        FormatHandle=dlopen("libavformat.so",RTLD_LAZY);
#ifdef HAVE_SWSCALE
        SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
        if (SwscaleHandle==0)
            SwscaleHandle=dlopen("libswscale.so.2",RTLD_LAZY);
#endif
    }
    m_error="";
    QStringList errs;
    if (!CodecHandle) {
        errs << i18n("Cannot open the library %1").arg("libavcodec");
    }
    if (!FormatHandle ) {
        errs << i18n("Cannot open the library %1").arg("libavformat");
    }
#ifdef HAVE_SWSCALE
    if (!SwscaleHandle) {
        errs << i18n("Cannot open the library %1").arg("libswscale");
    }
#endif

    av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
    av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
    av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
    avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
    avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
    avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
    avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
    av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
    avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
    av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
    avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
    if (avcodec_decode_video==0) avcodec_decode_video=(avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video2");
#ifndef HAVE_SWSCALE
    img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
//if img_convert is null (deprecated in ffmpeg), we need libswscale
    if (!img_convert)
      errs << i18n("Cannot open the library %1").arg("libswscale");
#endif
    av_free = (av_free_t)dlsym(CodecHandle,"av_free");
    av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");
    if (av_free_packet==0)
         av_free_packet=av_free_packet_internal;
    avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
    av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
    av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
    av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
    avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
#ifdef HAVE_SWSCALE
    sws_freeContext= (sws_freeContext_t)dlsym(SwscaleHandle,"sws_freeContext");
    sws_getContext=(sws_getContext_t)dlsym(SwscaleHandle,"sws_getContext");
    sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
#endif
    av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
    
    if (errs.count() >0) {
        m_error=errs.join("\n");
        k9Dialogs::error(m_error,"k9copy",QStringList());

    
    av_register_all();
    m_opened=false;

    glibref++;
}


k9AviDecode::~k9AviDecode() {
    if (m_opened)
        close();
    glibref--;
    if (glibref==0) {
	if (FormatHandle)
        	dlclose(FormatHandle);
	if (CodecHandle)
        	dlclose(CodecHandle);
#ifdef HAVE_SWSCALE
	if (SwscaleHandle)
        	dlclose(CodecHandle);
#endif
	FormatHandle=0;
	CodecHandle=0;
    }

}

bool k9AviDecode::open(const QString & _fileName) {

        close();

    // Open video file
    if (avformat_open_input(&m_FormatCtx, _fileName.toUtf8(), NULL, NULL)!=0) {
        m_error=i18n("Couldn't open the file %1").arg(_fileName);
        return false; // Couldn't open file}
    }
// Retrieve stream information
    if (avformat_find_stream_info(m_FormatCtx, NULL)<0) {
        m_error =i18n("Couldn't find stream information");
        return false; // Couldn't find stream information
    }

        return false; // Codec not found
    }
// Open codec
    if (avcodec_open2(m_CodecCtx, m_Codec, NULL)<0) {
        m_error =i18n("Could'nt open the codec");
        return false; // Could not open codec
    }

        // Is this a packet from the video stream?
        if (packet.stream_index==m_videoStream) {
            // Decode video frame
            avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished,
                                 &packet);

            // Did we get a video frame?
            if (frameFinished) {
//            if (m_Frame->pts >=fspos)
		int64_t cur_dts=fspos;
		cur_dts=packet.dts;
		    cur_dts=	m_FormatCtx->cur_st->cur_dts;
                if (cur_dts >=fspos) {
                    bFound=true;
#ifndef HAVE_SWSCALE

        avcodec_close(m_CodecCtx);

        // Close the video file
        avformat_close_input(&m_FormatCtx);
        m_opened=false;
    }
}





#include "k9common.h"
#include <qobject.h>
extern "C" {
#include <libavformat/avformat.h>
}
#include <qimage.h>
#include <cstdlib>
#include <QObject>
#ifdef HAVE_SWSCALE
extern "C" {
#include <libswscale/swscale.h>
}
#endif
/**
	@author Jean-Michel PETIT <k9copy@free.fr>
*/


//typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
typedef void (*av_register_all_t) (void);
typedef int64_t (*av_gettime_t) (void);
typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
typedef int (*av_find_stream_info_t)(AVFormatContext *);
typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
typedef AVFrame * (*avcodec_alloc_frame_t)(void);

typedef int (*avpicture_get_size_t)(int , int , int );
typedef void * (*av_malloc_t)(unsigned int );
typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);

typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
typedef void (*av_free_t)(void *);
typedef int (*avcodec_close_t)(AVCodecContext *);
typedef void (*av_close_input_file_t)(AVFormatContext *);
typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); 		typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational )	;
typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
typedef void (*av_free_packet_t)(AVPacket *);

#ifdef HAVE_SWSCALE
typedef void (*sws_freeContext_t)(struct SwsContext *swsContext);
typedef struct SwsContext* (*sws_getContext_t)(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat, int flags,
                                  SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
typedef int (*sws_scale_t)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,int srcSliceH, uint8_t* dst[], int dstStride[]);
#endif


class k9AviDecode : public QObject
{
Q_OBJECT

	QString getError() const;
	
private:
    av_register_all_t av_register_all;
    av_open_input_file_t av_open_input_file;
    av_find_stream_info_t av_find_stream_info;
    avcodec_find_decoder_t avcodec_find_decoder;
    avcodec_open_t avcodec_open;
    avcodec_alloc_frame_t avcodec_alloc_frame;
    av_seek_frame_t av_seek_frame;
    avpicture_get_size_t avpicture_get_size;
    av_malloc_t av_malloc;
    avpicture_fill_t avpicture_fill;
    av_read_frame_t av_read_frame;
    avcodec_decode_video_t avcodec_decode_video;
    img_convert_t img_convert;
    av_free_t av_free;
    avcodec_close_t avcodec_close;
    av_close_input_file_t av_close_input_file;
    av_rescale_q_t av_rescale_q;
    av_gettime_t av_gettime;
    avcodec_flush_buffers_t avcodec_flush_buffers;
    av_free_packet_t av_free_packet;
#ifdef HAVE_SWSCALE
    sws_freeContext_t sws_freeContext;
    sws_getContext_t sws_getContext;
    sws_scale_t sws_scale;
#endif
    void *CodecHandle;
    void *FormatHandle;
    void *SwscaleHandle;
    int glibref;

    AVFormatContext *m_FormatCtx;
    AVCodecContext *m_CodecCtx;
    AVCodec *m_Codec;

Lines 17-23 Link Here

(-)k9copy-2.3.8-Source.orig/src/import/k9importfiles.cpp (-1 / +4 lines)
17	#include "k9tools.h"	17	#include "k9tools.h"
18	#include <QDockWidget>	18	#include <QDockWidget>
19	#include "images.h"	19	#include "images.h"
20	#include "dvdread.h"	20	#include <ifo_types.h>
		21	#include <ifo_read.h>
		22	#include <nav_read.h>
		23	#include <nav_types.h>
21	#include <QMenu>	24	#include <QMenu>
22	#include <QCloseEvent>	25	#include <QCloseEvent>
23	#ifndef BACKLITE	26	#ifndef BACKLITE

Lines 24-32 Link Here

(-)k9copy-2.3.8-Source.orig/src/import/k9newdvd.cpp (-3 / +4 lines)
24	#include <qfileinfo.h>	24	#include <qfileinfo.h>
25	#include "k9cell.h"	25	#include "k9cell.h"
26	#include "k9ifo2.h"	26	#include "k9ifo2.h"
27	#include "nav_types.h"	27	#include <ifo_types.h>
28	#include "ifo_types.h"	28	#include <ifo_read.h>
29	#include "dvdread.h"	29	#include <nav_read.h>
		30	#include <nav_types.h>
30	#include <QDir>	31	#include <QDir>
31	#ifndef BACKLITE	32	#ifndef BACKLITE
32	#include <kstandarddirs.h>	33	#include <kstandarddirs.h>

Lines 40-46 Link Here

(-)k9copy-2.3.8-Source.orig/src/main/k9copy.cpp (-1 / +4 lines)
40	#include "k9tools.h"	40	#include "k9tools.h"
41	#include <QDockWidget>	41	#include <QDockWidget>
42	#include "images.h"	42	#include "images.h"
43	#include "dvdread.h"	43	#include <ifo_types.h>
		44	#include <ifo_read.h>
		45	#include <nav_read.h>
		46	#include <nav_types.h>
44	#include <QMenu>	47	#include <QMenu>
45	#include "k9dialogs.h"	48	#include "k9dialogs.h"
46	#include "k9assistant.h"	49	#include "k9assistant.h"




//
#include "k9plaympeg2.h"
#include "kdecmpeg2.h"
#include "dvdnav.h"

#include <dvdnav.h>
#include <qapplication.h>

k9PlayMPEG2::k9PlayMPEG2()



    /* open dvdnav handle */
    if (dvdnav_open(&dvdnav, m_device.toUtf8()) != DVDNAV_STATUS_OK) {
        setError("ERR:Error on dvdnav_open\n");
        return ;
    }




#include "k9cell.h"
#include "k9vamps.h"

#include <dvdnav.h>
#include <ifo_types.h>
#include <ifo_read.h>
#include <nav_read.h>
#include <nav_types.h>
#include <stdio.h>
#include <unistd.h>
#include <inttypes.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "dvdread.h"


#ifdef BACKLITE

    }

    /* open dvdnav handle */
    if (dvdnav_open(&dvdnav, m_device.toUtf8()) != DVDNAV_STATUS_OK) {
        writeOutput("ERR:Error on dvdnav_open\n");
        emit sigError(i18n("Error opening the DVD"));
        end();

Lines 18-24 Link Here

(-)k9copy-2.3.8-Source.orig/src/player/main.cpp (-1 / +4 lines)
18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	***************************************************************************/	19	***************************************************************************/
20		20
21	#include "src/dvdnav/common.h"	21	#include <ifo_types.h>
		22	#include <ifo_read.h>
		23	#include <nav_read.h>
		24	#include <nav_types.h>
22	#include "k9copy.h"	25	#include "k9copy.h"
23	#include "k9play.h"	26	#include "k9play.h"
24	#include <kapplication.h>	27	#include <kapplication.h>

Return to bug 505196

Lines 98-109 Link Here

(-)k9copy-2.3.8-Source.orig/src/core/k9videocodecs.cpp (-6 / +6 lines)
98	m_codecs[18]=_k9VideoCodec("ASUS v1","","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");	98	m_codecs[18]=_k9VideoCodec("ASUS v1","","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
99	m_codecs[19]=_k9VideoCodec("ASUS v2","","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");	99	m_codecs[19]=_k9VideoCodec("ASUS v2","","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
100	m_codecs[20]=_k9VideoCodec("flv","","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");	100	m_codecs[20]=_k9VideoCodec("flv","","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
101	m_codecs[21]=_k9VideoCodec("copy","","-vcodec copy","-vcodec copy","-vcodec copy","ffmpeg");	101	m_codecs[21]=_k9VideoCodec("copy","","-codec:v copy","-codec:v copy","-codec:v copy","ffmpeg");
102	m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");	102	m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
103	m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");	103	m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
104	m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");	104	m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
105	m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");	105	m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
106	m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");	106	m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
107		107
108	save();	108	save();
109		109

Lines 16-25 Link Here

(-)k9copy-2.3.8-Source.orig/CMakeLists.txt (-37 / +9 lines)
16	INCLUDE(CheckIncludeFiles)	16	INCLUDE(CheckIncludeFiles)
17	INCLUDE(FindLibMpeg2)	17	INCLUDE(FindLibMpeg2)
18	INCLUDE(FindXine)	18	INCLUDE(FindXine)
19	INCLUDE(FindAvcodec)
20	INCLUDE(FindAvformat)
21	INCLUDE(FindFFmpegScale)	19	INCLUDE(FindFFmpegScale)
22	#INCLUDE(FindLibDvdread)	20	INCLUDE(FindLibDvdread)
		21
		22	INCLUDE(FindPkgConfig OPTIONAL)
		23	pkg_check_modules(LIBAV REQUIRED libavformat libavcodec libavutil libswscale)
23		24
24	set (VERSION 2.3.8)	25	set (VERSION 2.3.8)
25		26
Lines 63-76 Link Here
63	FIND_LIBRARY(LIBDL_LIBRARY NAMES "c" PATHS )	64	FIND_LIBRARY(LIBDL_LIBRARY NAMES "c" PATHS )
64	MESSAGE(STATUS "Found library libc: ${LIBDL_LIBRARY}")	65	MESSAGE(STATUS "Found library libc: ${LIBDL_LIBRARY}")
65	ENDIF (LIBDL_LIBRARY)	66	ENDIF (LIBDL_LIBRARY)
66	#FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread")	67	FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread")
67
68		68
69	FINDAVFORMAT("avformat")
70	FINDAVCODEC("avcodec")
71		69
72	add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)	70	add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
73	add_subdirectory( src/dvdnav)
74	add_subdirectory( src/core )	71	add_subdirectory( src/core )
75	add_subdirectory( src/mpeg2)	72	add_subdirectory( src/mpeg2)
76	add_subdirectory(src/vamps)	73	add_subdirectory(src/vamps)
Lines 85-91 Link Here
85	add_subdirectory(doc)	82	add_subdirectory(doc)
86		83
87	include_directories(	84	include_directories(
88	${CMAKE_CURRENT_SOURCE_DIR}/src/dvdnav
89	${CMAKE_CURRENT_SOURCE_DIR}/src/devices	85	${CMAKE_CURRENT_SOURCE_DIR}/src/devices
90	${CMAKE_CURRENT_SOURCE_DIR}/src/core	86	${CMAKE_CURRENT_SOURCE_DIR}/src/core
91	${CMAKE_CURRENT_SOURCE_DIR}/src/vamps	87	${CMAKE_CURRENT_SOURCE_DIR}/src/vamps
Lines 97-106 Link Here
97	${CMAKE_CURRENT_SOURCE_DIR}/src/import	93	${CMAKE_CURRENT_SOURCE_DIR}/src/import
98	${CMAKE_CURRENT_SOURCE_DIR}/src/player	94	${CMAKE_CURRENT_SOURCE_DIR}/src/player
99	${CMAKE_CURRENT_SOURCE_DIR}/src/subtitles	95	${CMAKE_CURRENT_SOURCE_DIR}/src/subtitles
100	${CMAKE_CURRENT_SOURCE_DIR}/src/dvdread
101	${CMAKE_CURRENT_SOURCE_DIR}/src/batch	96	${CMAKE_CURRENT_SOURCE_DIR}/src/batch
102	${KDE4_INCLUDES} ${QT_INCLUDES}	97	${KDE4_INCLUDES} ${QT_INCLUDES}
103	#${LIBDVDREAD_INCLUDE_DIR}/dvdread	98	${LIBDVDREAD_INCLUDE_DIR}/dvdread
		99	${LIBDVDREAD_INCLUDE_DIR}/dvdnav
104	${AVCODEC_INCLUDE_DIR}	100	${AVCODEC_INCLUDE_DIR}
105	${AVFORMAT_INCLUDE_DIR}	101	${AVFORMAT_INCLUDE_DIR}
106	${FFMPEGSCALE_INCLUDE_DIR}	102	${FFMPEGSCALE_INCLUDE_DIR}
Lines 116-149 Link Here
116	src/subtitles/k9subtitle2pgm.cpp	112	src/subtitles/k9subtitle2pgm.cpp
117	)	113	)
118		114
119	set (libdvdnav_SRCS
120	src/dvdnav/decoder.c
121	src/dvdnav/dvdnav.c
122	src/dvdnav/highlight.c
123	src/dvdnav/navigation.c
124	src/dvdnav/read_cache.c
125	src/dvdnav/remap.c
126	src/dvdnav/searching.c
127	src/dvdnav/settings.c
128	src/dvdnav/vm.c
129	src/dvdnav/vmcmd.c
130	)
131
132	set (vamps_SRCS	115	set (vamps_SRCS
133	src/vamps/k9fifo.cpp	116	src/vamps/k9fifo.cpp
134	src/vamps/k9requant.cpp	117	src/vamps/k9requant.cpp
135	src/vamps/k9vamps.cpp	118	src/vamps/k9vamps.cpp
136	)	119	)
137		120
138	set (dvdread_SRCS
139	src/dvdread/dvd_input.c
140	src/dvdread/dvd_reader.c
141	src/dvdread/dvd_udf.c
142	src/dvdread/ifo_read.c
143	src/dvdread/md5.c
144	src/dvdread/nav_read.c
145	)
146
147		121
148	set (core_SRCS	122	set (core_SRCS
149	src/core/k9dvd.cpp	123	src/core/k9dvd.cpp
Lines 309-320 Link Here
309	)	283	)
310		284
311	set (k9copylib_SRCS	285	set (k9copylib_SRCS
312	${libdvdnav_SRCS}
313	${core_SRCS}	286	${core_SRCS}
314	${vamps_SRCS}	287	${vamps_SRCS}
315	${mpeg2_SRCS}	288	${mpeg2_SRCS}
316	${subtitles_SRCS}	289	${subtitles_SRCS}
317	${dvdread_SRCS}
318	${backup_SRCS}	290	${backup_SRCS}
319	)	291	)
320		292
Lines 341-347 Link Here
341		313
342		314
343	kde4_add_library(k9copylib STATIC ${k9copylib_SRCS})	315	kde4_add_library(k9copylib STATIC ${k9copylib_SRCS})
344	target_link_libraries(k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS} ${KDE4_KIO_LIBS} ${LIBMPEG2_LIBRARY} ${LIBMPEG2CONVERT_LIBRARY} ${LIBDL_LIBRARY})	316	target_link_libraries(k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS} ${KDE4_KIO_LIBS} ${LIBMPEG2_LIBRARY} ${LIBMPEG2CONVERT_LIBRARY} ${LIBDL_LIBRARY} ${LIBDVDREAD_LIBRARY} dvdnav)
345		317
346	kde4_add_ui_files(k9copy_SRCS )	318	kde4_add_ui_files(k9copy_SRCS )
347		319
Lines 351-357 Link Here
351		323
352	MESSAGE(STATUS "Found library solid: ${KDE4_SOLID_LIBS}")	324	MESSAGE(STATUS "Found library solid: ${KDE4_SOLID_LIBS}")
353		325
354	target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${PHONON_LIBRARY} ${KDE4_SOLID_LIBS})	326	target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${PHONON_LIBRARY} ${KDE4_SOLID_LIBS} ${LIBAV_LIBRARIES})
355	target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} )	327	target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} )
356	target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${XINE_LIBRARY} ${X11_X11_LIB} )	328	target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${XINE_LIBRARY} ${X11_X11_LIB} )
357		329

Lines 10-24 Link Here

(-)k9copy-2.3.8-Source.orig/src/import/k9avidecode.cpp (-86 / +7 lines)
10	//	10	//
11	//	11	//
12	#include "k9avidecode.h"	12	#include "k9avidecode.h"
13	#include <avcodec.h>
14	#include <qimage.h>	13	#include <qimage.h>
15	#include <dlfcn.h>	14	#include <dlfcn.h>
16	#include "k9common.h"	15	#include "k9common.h"
17		16
18	#ifdef HAVE_SWSCALE	17	#ifdef HAVE_SWSCALE
19		18
20	#include "swscale.h"
21
22	static int sws_flags = SWS_BICUBIC;	19	static int sws_flags = SWS_BICUBIC;
23		20
24	#endif	21	#endif
Lines 35-101 Link Here
35		32
36	k9AviDecode::k9AviDecode(QObject parent, const char )	33	k9AviDecode::k9AviDecode(QObject parent, const char )
37	: QObject(parent) {	34	: QObject(parent) {
38	CodecHandle=0;
39	FormatHandle=0;
40	SwscaleHandle=0;
41	glibref=0;
42	if (glibref==0) {
43	CodecHandle=dlopen("libavcodec.so",RTLD_LAZY ); //\| RTLD_GLOBAL
44	FormatHandle=dlopen("libavformat.so",RTLD_LAZY);
45	#ifdef HAVE_SWSCALE
46	SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
47	if (SwscaleHandle==0)
48	SwscaleHandle=dlopen("libswscale.so.2",RTLD_LAZY);
49	#endif
50	}
51	m_error="";	35	m_error="";
52	QStringList errs;	36	QStringList errs;
53	if (!CodecHandle) {
54	errs << i18n("Cannot open the library %1").arg("libavcodec");
55	}
56	if (!FormatHandle ) {
57	errs << i18n("Cannot open the library %1").arg("libavformat");
58	}
59	#ifdef HAVE_SWSCALE
60	if (!SwscaleHandle) {
61	errs << i18n("Cannot open the library %1").arg("libswscale");
62	}
63	#endif
64
65	av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
66	av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
67	av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
68	avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
69	avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
70	avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
71	avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
72	av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
73	avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
74	av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
75	avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
76	if (avcodec_decode_video==0) avcodec_decode_video=(avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video2");
77	#ifndef HAVE_SWSCALE
78	img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
79	//if img_convert is null (deprecated in ffmpeg), we need libswscale
80	if (!img_convert)
81	errs << i18n("Cannot open the library %1").arg("libswscale");
82	#endif
83	av_free = (av_free_t)dlsym(CodecHandle,"av_free");
84	av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");
85	if (av_free_packet==0)
86	av_free_packet=av_free_packet_internal;
87	avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
88	av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
89	av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
90	av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
91	avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
92	#ifdef HAVE_SWSCALE
93	sws_freeContext= (sws_freeContext_t)dlsym(SwscaleHandle,"sws_freeContext");
94	sws_getContext=(sws_getContext_t)dlsym(SwscaleHandle,"sws_getContext");
95	sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
96	#endif
97	av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
98
99	if (errs.count() >0) {	37	if (errs.count() >0) {
100	m_error=errs.join("\n");	38	m_error=errs.join("\n");
101	k9Dialogs::error(m_error,"k9copy",QStringList());	39	k9Dialogs::error(m_error,"k9copy",QStringList());
Lines 104-131 Link Here
104		42
105	av_register_all();	43	av_register_all();
106	m_opened=false;	44	m_opened=false;
107
108	glibref++;
109	}	45	}
110		46
111		47
112	k9AviDecode::~k9AviDecode() {	48	k9AviDecode::~k9AviDecode() {
113	if (m_opened)	49	if (m_opened)
114	close();	50	close();
115	glibref--;
116	if (glibref==0) {
117	if (FormatHandle)
118	dlclose(FormatHandle);
119	if (CodecHandle)
120	dlclose(CodecHandle);
121	#ifdef HAVE_SWSCALE
122	if (SwscaleHandle)
123	dlclose(CodecHandle);
124	#endif
125	FormatHandle=0;
126	CodecHandle=0;
127	}
128
129	}	51	}
130		52
131	bool k9AviDecode::open(const QString & _fileName) {	53	bool k9AviDecode::open(const QString & _fileName) {
Lines 134-145 Link Here
134	close();	56	close();
135		57
136	// Open video file	58	// Open video file
137	if (av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0) {	59	if (avformat_open_input(&m_FormatCtx, _fileName.toUtf8(), NULL, NULL)!=0) {
138	m_error=i18n("Couldn't open the file %1").arg(_fileName);	60	m_error=i18n("Couldn't open the file %1").arg(_fileName);
139	return false; // Couldn't open file}	61	return false; // Couldn't open file}
140	}	62	}
141	// Retrieve stream information	63	// Retrieve stream information
142	if (av_find_stream_info(m_FormatCtx)<0) {	64	if (avformat_find_stream_info(m_FormatCtx, NULL)<0) {
143	m_error =i18n("Couldn't find stream information");	65	m_error =i18n("Couldn't find stream information");
144	return false; // Couldn't find stream information	66	return false; // Couldn't find stream information
145	}	67	}
Lines 168-174 Link Here
168	return false; // Codec not found	90	return false; // Codec not found
169	}	91	}
170	// Open codec	92	// Open codec
171	if (avcodec_open(m_CodecCtx, m_Codec)<0) {	93	if (avcodec_open2(m_CodecCtx, m_Codec, NULL)<0) {
172	m_error =i18n("Could'nt open the codec");	94	m_error =i18n("Could'nt open the codec");
173	return false; // Could not open codec	95	return false; // Could not open codec
174	}	96	}
Lines 245-259 Link Here
245	// Is this a packet from the video stream?	167	// Is this a packet from the video stream?
246	if (packet.stream_index==m_videoStream) {	168	if (packet.stream_index==m_videoStream) {
247	// Decode video frame	169	// Decode video frame
248	avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,	170	avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished,
249	packet.data, packet.size);	171	&packet);
250		172
251	// Did we get a video frame?	173	// Did we get a video frame?
252	if (frameFinished) {	174	if (frameFinished) {
253	// if (m_Frame->pts >=fspos)	175	// if (m_Frame->pts >=fspos)
254	int64_t cur_dts=fspos;	176	int64_t cur_dts=fspos;
255	if (m_FormatCtx->cur_st)	177	cur_dts=packet.dts;
256	cur_dts= m_FormatCtx->cur_st->cur_dts;
257	if (cur_dts >=fspos) {	178	if (cur_dts >=fspos) {
258	bFound=true;	179	bFound=true;
259	#ifndef HAVE_SWSCALE	180	#ifndef HAVE_SWSCALE
Lines 309-315 Link Here
309	avcodec_close(m_CodecCtx);	230	avcodec_close(m_CodecCtx);
310		231
311	// Close the video file	232	// Close the video file
312	av_close_input_file(m_FormatCtx);	233	avformat_close_input(&m_FormatCtx);
313	m_opened=false;	234	m_opened=false;
314	}	235	}
315	}	236	}

Lines 11-18 Link Here

(-)k9copy-2.3.8-Source.orig/src/mpeg2/k9plaympeg2.cpp (-2 / +2 lines)
11	//	11	//
12	#include "k9plaympeg2.h"	12	#include "k9plaympeg2.h"
13	#include "kdecmpeg2.h"	13	#include "kdecmpeg2.h"
14	#include "dvdnav.h"
15		14
		15	#include <dvdnav.h>
16	#include <qapplication.h>	16	#include <qapplication.h>
17		17
18	k9PlayMPEG2::k9PlayMPEG2()	18	k9PlayMPEG2::k9PlayMPEG2()
Lines 50-56 Link Here
50		49
51		50
52	/* open dvdnav handle */	51	/* open dvdnav handle */
53	if (dvdnav_open(&dvdnav, m_device.toUtf8(),m_dvd) != DVDNAV_STATUS_OK) {	52	if (dvdnav_open(&dvdnav, m_device.toUtf8()) != DVDNAV_STATUS_OK) {
54	setError("ERR:Error on dvdnav_open\n");	53	setError("ERR:Error on dvdnav_open\n");
55	return ;	54	return ;
56	}	55	}

Lines 14-28 Link Here

(-)k9copy-2.3.8-Source.orig/src/player/k9play.cpp (-4 / +6 lines)
14	#include "k9cell.h"	14	#include "k9cell.h"
15	#include "k9vamps.h"	15	#include "k9vamps.h"
16		16
17	#include "dvdnav.h"	17	#include <dvdnav.h>
18	#include "dvdread.h"	18	#include <ifo_types.h>
		19	#include <ifo_read.h>
		20	#include <nav_read.h>
		21	#include <nav_types.h>
19	#include <stdio.h>	22	#include <stdio.h>
20	#include <unistd.h>	23	#include <unistd.h>
21	#include <inttypes.h>	24	#include <inttypes.h>
22	#include <sys/types.h>	25	#include <sys/types.h>
23	#include <sys/stat.h>	26	#include <sys/stat.h>
24	#include <fcntl.h>	27	#include <fcntl.h>
25	#include "dvdread.h"
26		28
27		29
28	#ifdef BACKLITE	30	#ifdef BACKLITE
Lines 351-357 Link Here
351	}	353	}
352		354
353	/* open dvdnav handle */	355	/* open dvdnav handle */
354	if (dvdnav_open(&dvdnav, m_device.toUtf8(),NULL) != DVDNAV_STATUS_OK) {	356	if (dvdnav_open(&dvdnav, m_device.toUtf8()) != DVDNAV_STATUS_OK) {
355	writeOutput("ERR:Error on dvdnav_open\n");	357	writeOutput("ERR:Error on dvdnav_open\n");
356	emit sigError(i18n("Error opening the DVD"));	358	emit sigError(i18n("Error opening the DVD"));
357	end();	359	end();