Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finally h264 decoding 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30132 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David McPaul 2009-04-12 03:34:24 +00:00
parent 11c511b999
commit 25b3d00ba8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/add-ons/media/plugins/avcodec/avcodec.cpp
View File

@ -123,7 +123,8 @@ avCodec::Setup(media_format *ioEncodedFormat, const void *infoBuffer,
TRACE("[%c] input_format=%s\n", isAudio?('a'):('v'), buffer);
TRACE("[%c] infoSize=%ld\n", isAudio?('a'):('v'), infoSize);
TRACE("[%c] user_data_type=%08lx\n", isAudio?('a'):('v'), ioEncodedFormat->user_data_type);
// TRACE("[%c] meta_data_size=%ld\n", isAudio?('a'):('v'), ioEncodedFormat->meta_data_size);
TRACE("[%c] meta_data_size=%ld\n", isAudio?('a'):('v'), ioEncodedFormat->MetaDataSize());
TRACE("[%c] info_size=%ld\n", isAudio?('a'):('v'), infoSize);
//#endif
media_format_description descr;
@ -321,10 +322,13 @@ avCodec::NegotiateOutputFormat(media_format *inout_format)
fOutputFrameRate = fOutputVideoFormat.field_rate;
if (fInputFormat.MetaDataSize() > 0) {
ffc->extradata = (uint8_t *)fInputFormat.MetaData();
ffc->extradata_size = fInputFormat.MetaDataSize();
}
ffc->extradata = (uint8_t *)fExtraData;
ffc->extradata_size = fExtraDataSize;
// if (fInputFormat.MetaDataSize() > 0) {
// ffc->extradata = (uint8_t *)fInputFormat.MetaData();
// ffc->extradata_size = fInputFormat.MetaDataSize();
// }
TRACE("#### requested video format 0x%x\n",
inout_format->u.raw_video.display.format);

6
src/add-ons/media/plugins/avcodec/libavcodec/config.h
View File

@ -31,7 +31,7 @@
#define HAVE_MMX2 1
#define HAVE_NEON 0
#define HAVE_PPC4XX 0
#define HAVE_SSE 1
#define HAVE_SSE 0
#define HAVE_SSSE3 1
#define HAVE_VIS 0
#define HAVE_BEOSTHREADS 0
@ -54,8 +54,8 @@
#define HAVE_DLFCN_H 0
#define HAVE_DLOPEN 0
#define HAVE_DOS_PATHS 0
#define HAVE_EBP_AVAILABLE 1
#define HAVE_EBX_AVAILABLE 1
#define HAVE_EBP_AVAILABLE 0
#define HAVE_EBX_AVAILABLE 0
#define HAVE_FAST_64BIT 0
#define HAVE_FAST_CMOV 0
#define HAVE_FAST_UNALIGNED 1