wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1073003 - Fix warnings about macro redefinitions. r=ehsan

Browse Source 
--HG--
extra : rebase_source : 45baa6f38015d38829617a956c2ab754c9a8dfe5
This commit is contained in:
Botond Ballo 2014-12-23 03:16:33 -05:00
parent 8d0bfe4d08
commit 205a94aaab
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/omx/AudioOutput.h
View File

@ -26,8 +26,6 @@
#include "AudioSink.h"
#define LOG_TAG "AudioOffloadPlayer"
namespace mozilla {
/**

21
dom/media/omx/MediaCodecProxy.cpp
View File

@ -12,9 +12,8 @@
#include <stagefright/MetaData.h>
#include "stagefright/MediaErrors.h"
#define LOG_TAG "MediaCodecProxy"
#include <android/log.h>
#define ALOG(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
#define MCP_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "MediaCodecProxy", __VA_ARGS__)
#define TIMEOUT_DEQUEUE_INPUTBUFFER_MS 1000000ll
namespace android {
@ -496,15 +495,15 @@ bool MediaCodecProxy::Prepare()
status_t err;
if (start() != OK) {
ALOG("Couldn't start MediaCodec");
MCP_LOG("Couldn't start MediaCodec");
return false;
}
if (getInputBuffers(&mInputBuffers) != OK) {
ALOG("Couldn't get input buffers from MediaCodec");
MCP_LOG("Couldn't get input buffers from MediaCodec");
return false;
}
if (getOutputBuffers(&mOutputBuffers) != OK) {
ALOG("Couldn't get output buffers from MediaCodec");
MCP_LOG("Couldn't get output buffers from MediaCodec");
return false;
}
@ -514,13 +513,13 @@ bool MediaCodecProxy::Prepare()
bool MediaCodecProxy::UpdateOutputBuffers()
{
if (mCodec == nullptr) {
ALOG("MediaCodec has not been inited from input!");
MCP_LOG("MediaCodec has not been inited from input!");
return false;
}
status_t err = getOutputBuffers(&mOutputBuffers);
if (err != OK){
ALOG("Couldn't update output buffers from MediaCodec");
MCP_LOG("Couldn't update output buffers from MediaCodec");
return false;
}
return true;
@ -530,14 +529,14 @@ status_t MediaCodecProxy::Input(const uint8_t* aData, uint32_t aDataSize,
int64_t aTimestampUsecs, uint64_t aflags)
{
if (mCodec == nullptr) {
ALOG("MediaCodec has not been inited from input!");
MCP_LOG("MediaCodec has not been inited from input!");
return NO_INIT;
}
size_t index;
status_t err = dequeueInputBuffer(&index, TIMEOUT_DEQUEUE_INPUTBUFFER_MS);
if (err != OK) {
ALOG("dequeueInputBuffer returned %d", err);
MCP_LOG("dequeueInputBuffer returned %d", err);
return err;
}
@ -554,7 +553,7 @@ status_t MediaCodecProxy::Input(const uint8_t* aData, uint32_t aDataSize,
}
if (err != OK) {
ALOG("queueInputBuffer returned %d", err);
MCP_LOG("queueInputBuffer returned %d", err);
return err;
}
return err;
@ -563,7 +562,7 @@ status_t MediaCodecProxy::Input(const uint8_t* aData, uint32_t aDataSize,
status_t MediaCodecProxy::Output(MediaBuffer** aBuffer, int64_t aTimeoutUs)
{
if (mCodec == nullptr) {
ALOG("MediaCodec has not been inited from output!");
MCP_LOG("MediaCodec has not been inited from output!");
return NO_INIT;
}

5
dom/media/omx/OmxDecoder.cpp
View File

@ -33,9 +33,8 @@
#include "OMXCodecProxy.h"
#include "OmxDecoder.h"
#define LOG_TAG "OmxDecoder"
#include <android/log.h>
#define ALOG(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
#define OD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "OmxDecoder", __VA_ARGS__)
#ifdef PR_LOGGING
PRLogModuleInfo *gOmxDecoderLog;
@ -604,7 +603,7 @@ bool OmxDecoder::ReadVideo(VideoFrame *aFrame, int64_t aTimeUs,
}
continue;
} else if (err != OK) {
ALOG("Unexpected error when seeking to %lld", aTimeUs);
OD_LOG("Unexpected error when seeking to %lld", aTimeUs);
break;
}
// For some codecs, the length of first decoded frame after seek is 0.

1
dom/media/webrtc/MediaEngineGonkVideoSource.cpp
View File

@ -3,6 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "MediaEngineGonkVideoSource.h"
#undef LOG_TAG
#define LOG_TAG "MediaEngineGonkVideoSource"
#include <utils/Log.h>