i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codek Kit: Introduce BMetaData in Writer/MediaWriter

Browse Source 
* Remove SetCopyright as well.
This commit is contained in:
Barrett17
2018-11-21 17:22:58 +01:00
parent 9b50ad1db8
commit 608c9d9ae1
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/codec/MediaWriter.h
+7 -3
View File
@@ -5,6 +5,7 @@
#ifndef _MEDIA_WRITER_H #ifndef _MEDIA_WRITER_H
#define _MEDIA_WRITER_H #define _MEDIA_WRITER_H
#include <MetaData.h>
#include "EncoderPlugin.h" #include "EncoderPlugin.h"
#include "TList.h" #include "TList.h"
@@ -31,9 +32,12 @@ public:
const media_codec_info* codecInfo, const media_codec_info* codecInfo,
media_format* format, uint32 flags = 0); media_format* format, uint32 flags = 0);
status_t SetCopyright(int32 streamIndex, // TODO: One of those is probably misplaced here.
const char* copyright); // TODO: Why pointers? Just copy it
status_t SetCopyright(const char* copyright); status_t SetMetaData(BMetaData* data);
status_t SetMetaData(int32 streamIndex,
BMetaData* data);
status_t CommitHeader(); status_t CommitHeader();
status_t Flush(); status_t Flush();
status_t Close(); status_t Close();
headers/os/codec/WriterPlugin.h
+4 -3
View File
@@ -1,6 +1,7 @@
#ifndef _WRITER_PLUGIN_H #ifndef _WRITER_PLUGIN_H
#define _WRITER_PLUGIN_H #define _WRITER_PLUGIN_H
#include <MetaData.h>
#include <MediaTrack.h> #include <MediaTrack.h>
#include "MediaPlugin.h" #include "MediaPlugin.h"
@@ -16,7 +17,7 @@ public:
virtual status_t Init(const media_file_format* fileFormat) = 0; virtual status_t Init(const media_file_format* fileFormat) = 0;
virtual status_t SetCopyright(const char* copyright) = 0; virtual status_t SetMetaData(BMetaData* data) = 0;
virtual status_t CommitHeader() = 0; virtual status_t CommitHeader() = 0;
virtual status_t Flush() = 0; virtual status_t Flush() = 0;
virtual status_t Close() = 0; virtual status_t Close() = 0;
@@ -26,8 +27,8 @@ public:
const media_codec_info* codecInfo) = 0; const media_codec_info* codecInfo) = 0;
virtual status_t FreeCookie(void* cookie) = 0; virtual status_t FreeCookie(void* cookie) = 0;
virtual status_t SetCopyright(void* cookie, virtual status_t SetMetaData(void* cookie,
const char* copyright) = 0; BMetaData* data) = 0;
virtual status_t AddTrackInfo(void* cookie, uint32 code, virtual status_t AddTrackInfo(void* cookie, uint32 code,
const void* data, size_t size, const void* data, size_t size,
src/kits/codec/MediaWriter.cpp
+4 -4
View File
@@ -152,17 +152,17 @@ MediaWriter::CreateEncoder(Encoder** _encoder,
status_t status_t
MediaWriter::SetCopyright(const char* copyright) MediaWriter::SetMetaData(BMetaData* data)
{ {
if (fWriter == NULL) if (fWriter == NULL)
return B_NO_INIT; return B_NO_INIT;
return fWriter->SetCopyright(copyright); return fWriter->SetMetaData(data);
} }
status_t status_t
MediaWriter::SetCopyright(int32 streamIndex, const char* copyright) MediaWriter::SetMetaData(int32 streamIndex, BMetaData* data)
{ {
if (fWriter == NULL) if (fWriter == NULL)
return B_NO_INIT; return B_NO_INIT;
@@ -171,7 +171,7 @@ MediaWriter::SetCopyright(int32 streamIndex, const char* copyright)
if (!fStreamInfos.Get(streamIndex, &info)) if (!fStreamInfos.Get(streamIndex, &info))
return B_BAD_INDEX; return B_BAD_INDEX;
return fWriter->SetCopyright(info->cookie, copyright); return fWriter->SetMetaData(info->cookie, data);
} }