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

Remove the workaround for #11018 in two other places.

Browse Source 
The bug is fixed, the workaround can be removed.
This commit is contained in:
Adrien Destugues 2014-10-23 09:07:38 +02:00
parent d6d99ac108
commit 96dbc7d533
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/add-ons/media/media-add-ons/dvb/DVBMediaAddon.cpp
View File

@ -45,7 +45,7 @@ struct device_info
}; };
extern "C" BMediaAddOn * extern "C" BMediaAddOn *
make_media_addon(image_id id) make_media_addon(image_id id)
{ {
return new DVBMediaAddon(id); return new DVBMediaAddon(id);
@ -53,22 +53,8 @@ make_media_addon(image_id id)
DVBMediaAddon::DVBMediaAddon(image_id id) DVBMediaAddon::DVBMediaAddon(image_id id)
: BMediaAddOn(id) : BMediaAddOn(id)
{ {
// TODO: The following code block is a workaround for the bug #11018
// (https://dev.haiku-os.org/ticket/11018). Please remove this code block,
// once the bug is being resolved.
// The workaround triggers the loading of all media plugins prior to using
// methods of class BMediaFormats. Using the function get_next_encoder()
// is used because of two facts
// 1. It is publicly available and thus can be used by 3rd party apps,
// too.
// 2. It is already available by including BMediaFormats.h, so there is
// no need to include another header for this workaround.
int32 workaroundCookie = 0;
media_codec_info workaroundMediaCodecInfo;
get_next_encoder(&workaroundCookie, &workaroundMediaCodecInfo);
ScanFolder("/dev/dvb"); ScanFolder("/dev/dvb");
} }

21
src/tests/kits/media/mpeg2_decoder_test/mpeg2_decoder_test.cpp
View File

@ -120,27 +120,6 @@ main(int argc, char* argv[])
BFile* mpeg2EncodedFile = new BFile(kTestVideoFilename, O_RDONLY); BFile* mpeg2EncodedFile = new BFile(kTestVideoFilename, O_RDONLY);
BMediaDecoder* mpeg2Decoder = new FileDecoder(mpeg2EncodedFile); BMediaDecoder* mpeg2Decoder = new FileDecoder(mpeg2EncodedFile);
// TODO: The following code block is a workaround for the bug #11018
// (https://dev.haiku-os.org/ticket/11018). Please remove this code block,
// once the bug is being resolved.
// The workaround triggers the loading of all media plugins prior to using
// methods of class BMediaFormats. Using the function get_next_encoder()
// is used because of two facts
// 1. It is publicly available and thus can be used by 3rd party apps,
// too.
// 2. It is already available by including BMediaFormats.h, so there is
// no need to include another header for this workaround.
// Also, please leave the workaround code at this -prominent- place
// instead of moving it to the more appropriate place in
// CreateMpeg2MediaFormat(). This way it acts as a reminder to fix
// the bug :)
int32 workaroundCookie = 0;
media_codec_info workaroundMediaCodecInfo;
status_t workaroundStatus = get_next_encoder(&workaroundCookie,
&workaroundMediaCodecInfo);
if (workaroundStatus < B_OK)
exit(99);
media_format* mpeg2MediaFormat = CreateMpeg2MediaFormat(); media_format* mpeg2MediaFormat = CreateMpeg2MediaFormat();
mpeg2Decoder->SetTo(mpeg2MediaFormat); mpeg2Decoder->SetTo(mpeg2MediaFormat);
status_t settingMpeg2DecoderStatus = mpeg2Decoder->InitCheck(); status_t settingMpeg2DecoderStatus = mpeg2Decoder->InitCheck();