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

* Coding style cleanup, some removal of dead code.

Browse Source 
* Refactored NegotiateOutputFormat() and Decode() into two separate private
  methods each, one for video and one for audio.
* Keep reading chunks when video decoding, until we have got a picture. This
  gets us scrambled video instead of a black picture for h264 in mpegts.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31457 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-07-08 09:43:06 +00:00
parent 0c4d88d353
commit 12a9eb5d93
2 changed files with 507 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

879
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
View File

File diff suppressed because it is too large Load Diff

46
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
View File

@ -32,42 +32,55 @@ public:
const void* infoBuffer, size_t infoSize);
virtual status_t NegotiateOutputFormat(
media_format* outputFormat);
media_format* inOutFormat);
virtual status_t Decode(void* outBuffer, int64* outFrameCount,
media_header* mediaHeader,
media_decode_info* info);
media_header* mediaHeader,
media_decode_info* info);
virtual status_t Seek(uint32 seekTo, int64 seekFrame,
int64* frame, bigtime_t seekTime,
bigtime_t* time);
protected:
private:
status_t _NegotiateAudioOutputFormat(
media_format* inOutFormat);
status_t _NegotiateVideoOutputFormat(
media_format* inOutFormat);
status_t _DecodeAudio(void* outBuffer,
int64* outFrameCount,
media_header* mediaHeader,
media_decode_info* info);
status_t _DecodeVideo(void* outBuffer,
int64* outFrameCount,
media_header* mediaHeader,
media_decode_info* info);
media_header fHeader;
media_decode_info fInfo;
// friend class avCodecInputStream;
private:
media_format fInputFormat;
media_raw_video_format fOutputVideoFormat;
int64 fFrame;
bool isAudio;
bool fIsAudio;
int ffcodec_index_in_table;
int fCodecIndexInTable;
// helps to find codecpretty
// ffmpeg related datas
// FFmpeg related members
AVCodec* fCodec;
AVCodecContext* ffc;
AVFrame* ffpicture;
AVFrame* opicture;
AVCodecContext* fContext;
AVFrame* fInputPicture;
AVFrame* fOutputPicture;
bool fCodecInitDone;
gfx_convert_func conv_func; // colorspace convert func
gfx_convert_func fFormatConversionFunc;
char* fExtraData;
int fExtraDataSize;
@ -76,7 +89,8 @@ private:
bigtime_t fStartTime;
int32 fOutputFrameCount;
float fOutputFrameRate;
int fOutputFrameSize; // sample size * channel count
int fOutputFrameSize;
// sample size * channel count
const void* fChunkBuffer;
int32 fChunkBufferOffset;