зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1394591 - P2. Fix style. r=gerald
MozReview-Commit-ID: Jmyrf7d8hGW --HG-- extra : rebase_source : 5fef879c0f2847a98e72ae8a30e176bdeea3b780
This commit is contained in:
Родитель
15e988718f
Коммит
4098ebe21b
|
@ -18,7 +18,8 @@ class ImageContainer;
|
|||
class MediaData;
|
||||
class MediaRawData;
|
||||
|
||||
class BlankVideoDataCreator : public DummyDataCreator {
|
||||
class BlankVideoDataCreator : public DummyDataCreator
|
||||
{
|
||||
public:
|
||||
BlankVideoDataCreator(uint32_t aFrameWidth,
|
||||
uint32_t aFrameHeight,
|
||||
|
|
|
@ -8,9 +8,10 @@
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
class NullVideoDataCreator : public DummyDataCreator {
|
||||
class NullVideoDataCreator : public DummyDataCreator
|
||||
{
|
||||
public:
|
||||
NullVideoDataCreator() {}
|
||||
NullVideoDataCreator() { }
|
||||
|
||||
already_AddRefed<MediaData> Create(MediaRawData* aSample) override
|
||||
{
|
||||
|
@ -27,12 +28,14 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
class NullDecoderModule : public PlatformDecoderModule {
|
||||
class NullDecoderModule : public PlatformDecoderModule
|
||||
{
|
||||
public:
|
||||
|
||||
// Decode thread.
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const CreateDecoderParams& aParams) override {
|
||||
already_AddRefed<MediaDataDecoder> CreateVideoDecoder(
|
||||
const CreateDecoderParams& aParams) override
|
||||
{
|
||||
UniquePtr<DummyDataCreator> creator = MakeUnique<NullVideoDataCreator>();
|
||||
RefPtr<MediaDataDecoder> decoder = new DummyMediaDataDecoder(
|
||||
Move(creator), NS_LITERAL_CSTRING("null media data decoder"), aParams);
|
||||
|
@ -40,21 +43,22 @@ public:
|
|||
}
|
||||
|
||||
// Decode thread.
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const CreateDecoderParams& aParams) override {
|
||||
already_AddRefed<MediaDataDecoder> CreateAudioDecoder(
|
||||
const CreateDecoderParams& aParams) override
|
||||
{
|
||||
MOZ_ASSERT(false, "Audio decoders are unsupported.");
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool
|
||||
SupportsMimeType(const nsACString& aMimeType,
|
||||
DecoderDoctorDiagnostics* aDiagnostics) const override
|
||||
bool SupportsMimeType(const nsACString& aMimeType,
|
||||
DecoderDoctorDiagnostics* aDiagnostics) const override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
already_AddRefed<PlatformDecoderModule> CreateNullDecoderModule()
|
||||
already_AddRefed<PlatformDecoderModule>
|
||||
CreateNullDecoderModule()
|
||||
{
|
||||
RefPtr<PlatformDecoderModule> pdm = new NullDecoderModule();
|
||||
return pdm.forget();
|
||||
|
|
|
@ -17,7 +17,8 @@ namespace mozilla {
|
|||
|
||||
class TaskQueue;
|
||||
|
||||
class AppleATDecoder : public MediaDataDecoder {
|
||||
class AppleATDecoder : public MediaDataDecoder
|
||||
{
|
||||
public:
|
||||
AppleATDecoder(const AudioInfo& aConfig,
|
||||
TaskQueue* aTaskQueue);
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
class AppleDecoderModule : public PlatformDecoderModule {
|
||||
class AppleDecoderModule : public PlatformDecoderModule
|
||||
{
|
||||
public:
|
||||
AppleDecoderModule();
|
||||
virtual ~AppleDecoderModule();
|
||||
|
|
|
@ -14,7 +14,8 @@ namespace mozilla {
|
|||
// Wrapper class to call CFRelease on reference types
|
||||
// when they go out of scope.
|
||||
template <class T>
|
||||
class AutoCFRelease {
|
||||
class AutoCFRelease
|
||||
{
|
||||
public:
|
||||
MOZ_IMPLICIT AutoCFRelease(T aRef)
|
||||
: mRef(aRef)
|
||||
|
@ -45,7 +46,8 @@ private:
|
|||
|
||||
// CFRefPtr: A CoreFoundation smart pointer.
|
||||
template <class T>
|
||||
class CFRefPtr {
|
||||
class CFRefPtr
|
||||
{
|
||||
public:
|
||||
explicit CFRefPtr(T aRef)
|
||||
: mRef(aRef)
|
||||
|
|
|
@ -17,7 +17,8 @@
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
class AppleVTDecoder : public MediaDataDecoder {
|
||||
class AppleVTDecoder : public MediaDataDecoder
|
||||
{
|
||||
public:
|
||||
AppleVTDecoder(const VideoInfo& aConfig,
|
||||
TaskQueue* aTaskQueue,
|
||||
|
|
|
@ -28,7 +28,8 @@ public:
|
|||
private:
|
||||
static void* sLink;
|
||||
|
||||
static enum LinkStatus {
|
||||
static enum LinkStatus
|
||||
{
|
||||
LinkStatus_INIT = 0,
|
||||
LinkStatus_FAILED,
|
||||
LinkStatus_SUCCEEDED
|
||||
|
|
|
@ -16,8 +16,7 @@ struct AVDictionary;
|
|||
struct AVCodecParserContext;
|
||||
struct PRLibrary;
|
||||
|
||||
namespace mozilla
|
||||
{
|
||||
namespace mozilla {
|
||||
|
||||
struct MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS FFmpegLibWrapper
|
||||
{
|
||||
|
|
|
@ -56,7 +56,8 @@ typedef OmxPromiseLayer::BUFFERLIST BUFFERLIST;
|
|||
*
|
||||
* OmxPlatformLayer acts as the OpenMAX IL core.
|
||||
*/
|
||||
class OmxDataDecoder : public MediaDataDecoder {
|
||||
class OmxDataDecoder : public MediaDataDecoder
|
||||
{
|
||||
protected:
|
||||
virtual ~OmxDataDecoder();
|
||||
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
class OmxDecoderModule : public PlatformDecoderModule {
|
||||
class OmxDecoderModule : public PlatformDecoderModule
|
||||
{
|
||||
public:
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const CreateDecoderParams& aParams) override;
|
||||
|
|
|
@ -26,7 +26,8 @@ class TrackInfo;
|
|||
* For other platforms like Raspberry Pi, it will be easy to implement this layer
|
||||
* with the standard OpenMax IL api.
|
||||
*/
|
||||
class OmxPlatformLayer {
|
||||
class OmxPlatformLayer
|
||||
{
|
||||
public:
|
||||
typedef OmxPromiseLayer::BUFFERLIST BUFFERLIST;
|
||||
typedef OmxPromiseLayer::BufferData BufferData;
|
||||
|
|
|
@ -40,9 +40,10 @@ class TrackInfo;
|
|||
* All of functions and members in this class should be run in the same
|
||||
* TaskQueue.
|
||||
*/
|
||||
class OmxPromiseLayer {
|
||||
class OmxPromiseLayer
|
||||
{
|
||||
protected:
|
||||
virtual ~OmxPromiseLayer() {}
|
||||
virtual ~OmxPromiseLayer() { }
|
||||
|
||||
public:
|
||||
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(OmxPromiseLayer)
|
||||
|
@ -60,7 +61,8 @@ public:
|
|||
OmxBufferFailureHolder(OMX_ERRORTYPE aError, BufferData* aBuffer)
|
||||
: mError(aError)
|
||||
, mBuffer(aBuffer)
|
||||
{}
|
||||
{
|
||||
}
|
||||
|
||||
OMX_ERRORTYPE mError;
|
||||
BufferData* mBuffer;
|
||||
|
@ -68,13 +70,15 @@ public:
|
|||
|
||||
typedef MozPromise<BufferData*, OmxBufferFailureHolder, /* IsExclusive = */ false> OmxBufferPromise;
|
||||
|
||||
class OmxCommandFailureHolder {
|
||||
class OmxCommandFailureHolder
|
||||
{
|
||||
public:
|
||||
OmxCommandFailureHolder(OMX_ERRORTYPE aErrorType,
|
||||
OMX_COMMANDTYPE aCommandType)
|
||||
: mErrorType(aErrorType)
|
||||
, mCommandType(aCommandType)
|
||||
{}
|
||||
{
|
||||
}
|
||||
|
||||
OMX_ERRORTYPE mErrorType;
|
||||
OMX_COMMANDTYPE mCommandType;
|
||||
|
@ -120,16 +124,18 @@ public:
|
|||
// BufferData maintains the status of OMX buffer (OMX_BUFFERHEADERTYPE).
|
||||
// mStatus tracks the buffer owner.
|
||||
// And a promise because OMX buffer working among different threads.
|
||||
class BufferData {
|
||||
class BufferData
|
||||
{
|
||||
protected:
|
||||
virtual ~BufferData() {}
|
||||
virtual ~BufferData() { }
|
||||
|
||||
public:
|
||||
explicit BufferData(OMX_BUFFERHEADERTYPE* aBuffer)
|
||||
: mEos(false)
|
||||
, mStatus(BufferStatus::FREE)
|
||||
, mBuffer(aBuffer)
|
||||
{}
|
||||
{
|
||||
}
|
||||
|
||||
typedef void* BufferID;
|
||||
|
||||
|
@ -173,7 +179,8 @@ public:
|
|||
// For input port buffer, the status transition is:
|
||||
// FREE -> OMX_COMPONENT -> OMX_CLIENT -> FREE
|
||||
//
|
||||
enum BufferStatus {
|
||||
enum BufferStatus
|
||||
{
|
||||
FREE,
|
||||
OMX_COMPONENT,
|
||||
OMX_CLIENT,
|
||||
|
@ -209,7 +216,8 @@ public:
|
|||
bool Event(OMX_EVENTTYPE aEvent, OMX_U32 aData1, OMX_U32 aData2);
|
||||
|
||||
protected:
|
||||
struct FlushCommand {
|
||||
struct FlushCommand
|
||||
{
|
||||
OMX_DIRTYPE type;
|
||||
OMX_PTR cmd;
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче