Backout changeset 40f9e902464a (bug 889699) because of Linux crashes on a CLOSED TREE

This commit is contained in:
Mike Hommey 2013-07-19 15:59:42 +09:00
parent 8a055ce3cf
commit b5159c1c4c

View File

@ -6,7 +6,7 @@
#include "GStreamerFormatHelper.h"
#include "nsCharSeparatedTokenizer.h"
#include "nsString.h"
#include "nsXPCOMStrings.h"
#include "GStreamerLoader.h"
#define ENTRY_FORMAT(entry) entry[0]
@ -36,7 +36,7 @@ void GStreamerFormatHelper::Shutdown() {
}
}
static char const *const sContainers[6][2] = {
char const *const GStreamerFormatHelper::mContainers[6][2] = {
{"video/mp4", "video/quicktime"},
{"video/quicktime", "video/quicktime"},
{"audio/mp4", "audio/x-m4a"},
@ -45,7 +45,7 @@ static char const *const sContainers[6][2] = {
{"audio/mp3", "audio/mpeg, mpegversion=(int)1"},
};
static char const *const sCodecs[9][2] = {
char const *const GStreamerFormatHelper::mCodecs[9][2] = {
{"avc1.42E01E", "video/x-h264"},
{"avc1.42001E", "video/x-h264"},
{"avc1.58A01E", "video/x-h264"},
@ -57,14 +57,6 @@ static char const *const sCodecs[9][2] = {
{"mp3", "audio/mpeg, mpegversion=(int)1"},
};
static char const * const sDefaultCodecCaps[][2] = {
{"video/mp4", "video/x-h264"},
{"video/quicktime", "video/x-h264"},
{"audio/mp4", "audio/mpeg, mpegversion=(int)4"},
{"audio/x-m4a", "audio/mpeg, mpegversion=(int)4"},
{"audio/mp3", "audio/mpeg, layer=(int)3"}
};
GStreamerFormatHelper::GStreamerFormatHelper()
: mFactories(nullptr),
mCookie(static_cast<uint32_t>(-1))
@ -74,15 +66,15 @@ GStreamerFormatHelper::GStreamerFormatHelper()
}
mSupportedContainerCaps = gst_caps_new_empty();
for (unsigned int i = 0; i < G_N_ELEMENTS(sContainers); i++) {
const char* capsString = sContainers[i][1];
for (unsigned int i = 0; i < G_N_ELEMENTS(mContainers); i++) {
const char* capsString = mContainers[i][1];
GstCaps* caps = gst_caps_from_string(capsString);
gst_caps_append(mSupportedContainerCaps, caps);
}
mSupportedCodecCaps = gst_caps_new_empty();
for (unsigned int i = 0; i < G_N_ELEMENTS(sCodecs); i++) {
const char* capsString = sCodecs[i][1];
for (unsigned int i = 0; i < G_N_ELEMENTS(mCodecs); i++) {
const char* capsString = mCodecs[i][1];
GstCaps* caps = gst_caps_from_string(capsString);
gst_caps_append(mSupportedCodecCaps, caps);
}
@ -100,41 +92,6 @@ GStreamerFormatHelper::~GStreamerFormatHelper() {
g_list_free(mFactories);
}
static GstCaps *
GetContainerCapsFromMIMEType(const char *aType) {
/* convert aMIMEType to gst container caps */
const char* capsString = nullptr;
for (uint32_t i = 0; i < G_N_ELEMENTS(sContainers); i++) {
if (!strcmp(ENTRY_FORMAT(sContainers[i]), aType)) {
capsString = ENTRY_CAPS(sContainers[i]);
break;
}
}
if (!capsString) {
/* we couldn't find any matching caps */
return nullptr;
}
return gst_caps_from_string(capsString);
}
static GstCaps *
GetDefaultCapsFromMIMEType(const char *aType) {
GstCaps *caps = GetContainerCapsFromMIMEType(aType);
for (uint32_t i = 0; i < G_N_ELEMENTS(sDefaultCodecCaps); i++) {
if (!strcmp(sDefaultCodecCaps[i][0], aType)) {
GstCaps *tmp = gst_caps_from_string(sDefaultCodecCaps[i][1]);
gst_caps_append(caps, tmp);
return caps;
}
}
return nullptr;
}
bool GStreamerFormatHelper::CanHandleMediaType(const nsACString& aMIMEType,
const nsAString* aCodecs) {
if (!sLoadOK) {
@ -144,15 +101,7 @@ bool GStreamerFormatHelper::CanHandleMediaType(const nsACString& aMIMEType,
const char *type;
NS_CStringGetData(aMIMEType, &type, NULL);
GstCaps *caps;
if (aCodecs && !aCodecs->IsEmpty()) {
caps = ConvertFormatsToCaps(type, aCodecs);
} else {
// Get a minimal set of codec caps for this MIME type we should support so
// that we don't overreport MIME types we are able to play.
caps = GetDefaultCapsFromMIMEType(type);
}
GstCaps* caps = ConvertFormatsToCaps(type, aCodecs);
if (!caps) {
return false;
}
@ -169,20 +118,34 @@ GstCaps* GStreamerFormatHelper::ConvertFormatsToCaps(const char* aMIMEType,
unsigned int i;
GstCaps *caps = GetContainerCapsFromMIMEType(aMIMEType);
/* container only */
if (!caps) {
/* convert aMIMEType to gst container caps */
const char* capsString = nullptr;
for (i = 0; i < G_N_ELEMENTS(mContainers); i++) {
if (!strcmp(ENTRY_FORMAT(mContainers[i]), aMIMEType)) {
capsString = ENTRY_CAPS(mContainers[i]);
break;
}
}
if (!capsString) {
/* we couldn't find any matching caps */
return nullptr;
}
GstCaps* caps = gst_caps_from_string(capsString);
/* container only */
if (!aCodecs) {
return caps;
}
nsCharSeparatedTokenizer tokenizer(*aCodecs, ',');
while (tokenizer.hasMoreTokens()) {
const nsSubstring& codec = tokenizer.nextToken();
const char *capsString = nullptr;
capsString = nullptr;
for (i = 0; i < G_N_ELEMENTS(sCodecs); i++) {
if (codec.EqualsASCII(ENTRY_FORMAT(sCodecs[i]))) {
capsString = ENTRY_CAPS(sCodecs[i]);
for (i = 0; i < G_N_ELEMENTS(mCodecs); i++) {
if (codec.EqualsASCII(ENTRY_FORMAT(mCodecs[i]))) {
capsString = ENTRY_CAPS(mCodecs[i]);
break;
}
}