i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Very ugly hack to make DVB addon find the MPEG and AC3 codecs.

Browse Source 
Something appeards to be very wrong with codec registration.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39885 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2010-12-17 23:17:21 +00:00
parent 4da4784afa
commit 699dc0e367
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/dvb/Jamfile
+6
View File
@@ -2,6 +2,12 @@ SubDir HAIKU_TOP src add-ons media media-add-ons dvb ;
UsePrivateHeaders drivers ; UsePrivateHeaders drivers ;
SubDirHdrs [ FDirName $(SUBDIR) .. .. plugins ffmpeg ] ;
SubDirHdrs [ FDirName $(SUBDIR) .. .. plugins ffmpeg libavcodec ] ;
SubDirHdrs [ FDirName $(SUBDIR) .. .. plugins ffmpeg libavformat ] ;
SubDirHdrs [ FDirName $(SUBDIR) .. .. plugins ffmpeg libavutil ] ;
Addon dvb.media_addon : Addon dvb.media_addon :
DVBCard.cpp DVBCard.cpp
DVBMediaAddon.cpp DVBMediaAddon.cpp
src/add-ons/media/media-add-ons/dvb/MediaFormat.cpp
+21 -7
View File
@@ -27,6 +27,10 @@
#include <stdio.h> #include <stdio.h>
#include "MediaFormat.h" #include "MediaFormat.h"
#define UINT64_C(c) (c ## ULL)
extern "C" {
#include "avcodec.h"
}
void void
PrintFormat(const media_format &format) PrintFormat(const media_format &format)
@@ -51,8 +55,11 @@ GetHeaderFormatAc3Audio(media_format *out_format, const uint8 *header, size_t si
status_t status; status_t status;
media_format_description desc; media_format_description desc;
desc.family = B_WAV_FORMAT_FAMILY; // desc.family = B_WAV_FORMAT_FAMILY;
desc.u.wav.codec = 0x2000; // desc.u.wav.codec = 0x2000;
desc.family = B_MISC_FORMAT_FAMILY;
desc.u.misc.file_format = 'ffmp';
desc.u.misc.codec = CODEC_ID_AC3;
BMediaFormats formats; BMediaFormats formats;
status = formats.InitCheck(); status = formats.InitCheck();
@@ -103,9 +110,13 @@ GetHeaderFormatMpegAudio(media_format *out_format, const uint8 *header, size_t s
status_t status; status_t status;
media_format_description desc; media_format_description desc;
desc.family = B_MPEG_FORMAT_FAMILY; // desc.family = B_MPEG_FORMAT_FAMILY;
desc.u.mpeg.id = B_MPEG_2_AUDIO_LAYER_2; // desc.u.mpeg.id = B_MPEG_2_AUDIO_LAYER_2;
desc.family = B_MISC_FORMAT_FAMILY;
desc.u.misc.file_format = 'ffmp';
desc.u.misc.codec = CODEC_ID_MP3;
BMediaFormats formats; BMediaFormats formats;
status = formats.InitCheck(); status = formats.InitCheck();
if (status) { if (status) {
@@ -133,8 +144,11 @@ GetHeaderFormatMpegVideo(media_format *out_format, const uint8 *header, size_t s
status_t status; status_t status;
media_format_description desc; media_format_description desc;
desc.family = B_MPEG_FORMAT_FAMILY; // desc.family = B_MPEG_FORMAT_FAMILY;
desc.u.mpeg.id = B_MPEG_2_VIDEO; // desc.u.mpeg.id = B_MPEG_2_VIDEO;
desc.family = B_MISC_FORMAT_FAMILY;
desc.u.misc.file_format = 'ffmp';
desc.u.misc.codec = CODEC_ID_MPEG2VIDEO;
BMediaFormats formats; BMediaFormats formats;
status = formats.InitCheck(); status = formats.InitCheck();