From 8ccd9c0741a04eacb1209170d4665f04466c2abf Mon Sep 17 00:00:00 2001
From: Barrett17 <b.vitruvio@gmail.com>
Date: Sun, 28 Oct 2018 16:14:25 +0100
Subject: [PATCH] codec_kit: Add some padding

---
 headers/os/codec/DecoderPlugin.h  | 1 +
 headers/os/codec/MediaExtractor.h | 2 ++
 headers/os/codec/MediaPlugin.h    | 5 +++++
 headers/os/codec/MediaStreamer.h  | 5 +++++
 headers/os/codec/MediaWriter.h    | 4 ++--
 src/kits/codec/MediaPlugin.cpp    | 4 ++++
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/headers/os/codec/DecoderPlugin.h b/headers/os/codec/DecoderPlugin.h
index 8981c24376..1f09a6caf3 100644
--- a/headers/os/codec/DecoderPlugin.h
+++ b/headers/os/codec/DecoderPlugin.h
@@ -19,6 +19,7 @@ public:
 									media_header* mediaHeader) = 0;
 };
 
+
 class Decoder {
 public:
 								Decoder();
diff --git a/headers/os/codec/MediaExtractor.h b/headers/os/codec/MediaExtractor.h
index 5612f4251b..e549934510 100644
--- a/headers/os/codec/MediaExtractor.h
+++ b/headers/os/codec/MediaExtractor.h
@@ -93,6 +93,8 @@ private:
 			int32				fStreamCount;
 
 			media_file_format	fFileFormat;
+
+			uint32				fReserved[5];
 };
 
 } // namespace media
diff --git a/headers/os/codec/MediaPlugin.h b/headers/os/codec/MediaPlugin.h
index 27b4071654..9eee20d7dd 100644
--- a/headers/os/codec/MediaPlugin.h
+++ b/headers/os/codec/MediaPlugin.h
@@ -19,6 +19,11 @@ private:
 	friend class PluginManager;
 
 			int32				fRefCount;
+
+	virtual void				_ReservedMediaPlugin1();
+	virtual void				_ReservedMediaPlugin2();
+
+			uint32				fReserved[5];
 };
 
 class Decoder;
diff --git a/headers/os/codec/MediaStreamer.h b/headers/os/codec/MediaStreamer.h
index 71de9f673d..89f4af58c2 100644
--- a/headers/os/codec/MediaStreamer.h
+++ b/headers/os/codec/MediaStreamer.h
@@ -25,6 +25,11 @@ public:
 private:
 			BUrl				fUrl;
 			Streamer*			fStreamer;
+
+			// No virtual padding needed. Looks like a design decision.
+			// Let's respect that, for now.
+			// Same apply to MediaWriter and MediaExtractor.
+			uint32				fReserved[5];
 };
 
 
diff --git a/headers/os/codec/MediaWriter.h b/headers/os/codec/MediaWriter.h
index a4fe3f725e..7fea170240 100644
--- a/headers/os/codec/MediaWriter.h
+++ b/headers/os/codec/MediaWriter.h
@@ -53,10 +53,10 @@ private:
 
 			BDataIO*			fTarget;
 			Writer*				fWriter;
-
 			List<StreamInfo>	fStreamInfos;
-
 			media_file_format	fFileFormat;
+
+			uint32				fReserved[5];
 };
 
 
diff --git a/src/kits/codec/MediaPlugin.cpp b/src/kits/codec/MediaPlugin.cpp
index 073e844b47..566308a457 100644
--- a/src/kits/codec/MediaPlugin.cpp
+++ b/src/kits/codec/MediaPlugin.cpp
@@ -18,3 +18,7 @@ MediaPlugin::~MediaPlugin()
 {
 }
 
+
+// FBC
+void MediaPlugin::_ReservedMediaPlugin1() {}
+void MediaPlugin::_ReservedMediaPlugin2() {}