codec_kit: Cosmetic changes

* Move padding at the bottom.
* Add some missing newline.
* Remove superfluous private statements.
This commit is contained in:
Barrett17
2018-10-28 15:48:48 +01:00
parent 59125d3ced
commit 4269364345
7 changed files with 31 additions and 28 deletions
+7 -6
View File
@@ -1,6 +1,7 @@
#ifndef _DECODER_PLUGIN_H #ifndef _DECODER_PLUGIN_H
#define _DECODER_PLUGIN_H #define _DECODER_PLUGIN_H
#include <MediaTrack.h> #include <MediaTrack.h>
#include <MediaFormats.h> #include <MediaFormats.h>
#include "MediaPlugin.h" #include "MediaPlugin.h"
@@ -48,18 +49,18 @@ public:
virtual status_t Perform(perform_code code, void* data); virtual status_t Perform(perform_code code, void* data);
private: private:
virtual void _ReservedDecoder1();
virtual void _ReservedDecoder2();
virtual void _ReservedDecoder3();
virtual void _ReservedDecoder4();
virtual void _ReservedDecoder5();
ChunkProvider* fChunkProvider; ChunkProvider* fChunkProvider;
// needed for plug-in reference count management // needed for plug-in reference count management
friend class PluginManager; friend class PluginManager;
MediaPlugin* fMediaPlugin; MediaPlugin* fMediaPlugin;
virtual void _ReservedDecoder1();
virtual void _ReservedDecoder2();
virtual void _ReservedDecoder3();
virtual void _ReservedDecoder4();
virtual void _ReservedDecoder5();
uint32 fReserved[5]; uint32 fReserved[5];
}; };
+3 -4
View File
@@ -88,10 +88,6 @@ private:
friend class PluginManager; friend class PluginManager;
MediaPlugin* fMediaPlugin; MediaPlugin* fMediaPlugin;
private:
// FBC padding
uint32 fReserved[20];
virtual void _ReservedEncoder1(); virtual void _ReservedEncoder1();
virtual void _ReservedEncoder2(); virtual void _ReservedEncoder2();
virtual void _ReservedEncoder3(); virtual void _ReservedEncoder3();
@@ -112,6 +108,9 @@ private:
virtual void _ReservedEncoder18(); virtual void _ReservedEncoder18();
virtual void _ReservedEncoder19(); virtual void _ReservedEncoder19();
virtual void _ReservedEncoder20(); virtual void _ReservedEncoder20();
// FBC padding
uint32 fReserved[20];
}; };
-2
View File
@@ -74,7 +74,6 @@ public:
void StopProcessing(); void StopProcessing();
private: private:
void _Init(BDataIO* source, int32 flags); void _Init(BDataIO* source, int32 flags);
@@ -82,7 +81,6 @@ private:
static int32 _ExtractorEntry(void* arg); static int32 _ExtractorEntry(void* arg);
void _ExtractorThread(); void _ExtractorThread();
private:
status_t fInitStatus; status_t fInitStatus;
sem_id fExtractorWaitSem; sem_id fExtractorWaitSem;
-1
View File
@@ -51,7 +51,6 @@ private:
void* cookie; void* cookie;
}; };
private:
BDataIO* fTarget; BDataIO* fTarget;
Writer* fWriter; Writer* fWriter;
+9 -6
View File
@@ -1,9 +1,11 @@
#ifndef _READER_PLUGIN_H #ifndef _READER_PLUGIN_H
#define _READER_PLUGIN_H #define _READER_PLUGIN_H
#include <MediaTrack.h> #include <MediaTrack.h>
#include "MediaPlugin.h" #include "MediaPlugin.h"
namespace BPrivate { namespace media { namespace BPrivate { namespace media {
class PluginManager; class PluginManager;
@@ -13,6 +15,7 @@ enum {
B_MEDIA_SEEK_TO_FRAME = 0x20000 B_MEDIA_SEEK_TO_FRAME = 0x20000
}; };
class Reader { class Reader {
public: public:
Reader(); Reader();
@@ -51,12 +54,6 @@ public:
virtual status_t Perform(perform_code code, void* data); virtual status_t Perform(perform_code code, void* data);
private: private:
virtual void _ReservedReader1();
virtual void _ReservedReader2();
virtual void _ReservedReader3();
virtual void _ReservedReader4();
virtual void _ReservedReader5();
void Setup(BDataIO* source); void Setup(BDataIO* source);
BDataIO* fSource; BDataIO* fSource;
@@ -65,6 +62,12 @@ private:
friend class PluginManager; friend class PluginManager;
MediaPlugin* fMediaPlugin; MediaPlugin* fMediaPlugin;
virtual void _ReservedReader1();
virtual void _ReservedReader2();
virtual void _ReservedReader3();
virtual void _ReservedReader4();
virtual void _ReservedReader5();
uint32 fReserved[5]; uint32 fReserved[5];
}; };
+6 -3
View File
@@ -13,23 +13,26 @@ namespace BPrivate { namespace media {
class PluginManager; class PluginManager;
class Streamer { class Streamer {
public: public:
Streamer(); Streamer();
virtual ~Streamer(); virtual ~Streamer();
virtual status_t Sniff(const BUrl& url, BDataIO** source) = 0; virtual status_t Sniff(const BUrl& url, BDataIO** source) = 0;
private: private:
friend class PluginManager;
MediaPlugin* fMediaPlugin;
virtual void _ReservedStreamer1(); virtual void _ReservedStreamer1();
virtual void _ReservedStreamer2(); virtual void _ReservedStreamer2();
virtual void _ReservedStreamer3(); virtual void _ReservedStreamer3();
virtual void _ReservedStreamer4(); virtual void _ReservedStreamer4();
virtual void _ReservedStreamer5(); virtual void _ReservedStreamer5();
MediaPlugin* fMediaPlugin;
uint32 fReserved[5]; uint32 fReserved[5];
friend class PluginManager;
}; };
+6 -6
View File
@@ -41,12 +41,6 @@ public:
virtual status_t Perform(perform_code code, void* data); virtual status_t Perform(perform_code code, void* data);
private: private:
virtual void _ReservedWriter1();
virtual void _ReservedWriter2();
virtual void _ReservedWriter3();
virtual void _ReservedWriter4();
virtual void _ReservedWriter5();
void Setup(BDataIO* target); void Setup(BDataIO* target);
BDataIO* fTarget; BDataIO* fTarget;
@@ -55,6 +49,12 @@ private:
friend class PluginManager; friend class PluginManager;
MediaPlugin* fMediaPlugin; MediaPlugin* fMediaPlugin;
virtual void _ReservedWriter1();
virtual void _ReservedWriter2();
virtual void _ReservedWriter3();
virtual void _ReservedWriter4();
virtual void _ReservedWriter5();
uint32 fReserved[5]; uint32 fReserved[5];
}; };