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

MediaPlayer: fix reporting wrong format

Browse Source 
Now it allows to connect MediaPlayer video producer to differnt node in Cortex.

Change-Id: I7ee598ea64d10e8fa876259e7a4480a650a0e189
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3034
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
X512
2020-07-18 13:25:09 +00:00
committed by Adrien Destugues
parent d9f74c873b
commit f27269a67d
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
+16 -8
View File
@@ -357,14 +357,22 @@ VideoProducer::PrepareToConnect(const media_source& source,
return B_MEDIA_BAD_FORMAT; return B_MEDIA_BAD_FORMAT;
} }
if (format->u.raw_video.display.line_width == 0) if (format->u.raw_video.display.line_width == 0) {
format->u.raw_video.display.line_width = 384; format->u.raw_video.display.line_width
if (format->u.raw_video.display.line_count == 0) = fSupplier->Format().u.raw_video.display.line_width;
format->u.raw_video.display.line_count = 288; }
if (format->u.raw_video.field_rate == 0) if (format->u.raw_video.display.line_count == 0) {
format->u.raw_video.field_rate = 25.0; format->u.raw_video.display.line_count
if (format->u.raw_video.display.bytes_per_row == 0) = fSupplier->Format().u.raw_video.display.line_count;
format->u.raw_video.display.bytes_per_row = format->u.raw_video.display.line_width * 4; }
if (format->u.raw_video.field_rate == 0) {
format->u.raw_video.field_rate
= fSupplier->Format().u.raw_video.field_rate;
}
if (format->u.raw_video.display.bytes_per_row == 0) {
format->u.raw_video.display.bytes_per_row
= fSupplier->Format().u.raw_video.display.bytes_per_row;
}
*outSource = fOutput.source; *outSource = fOutput.source;
strcpy(outName, fOutput.name); strcpy(outName, fOutput.name);
src/apps/mediaplayer/media_node_framework/video/VideoSupplier.h
+2
View File
@@ -8,6 +8,7 @@
#include <SupportDefs.h> #include <SupportDefs.h>
#include <MediaFormats.h>
struct media_raw_video_format; struct media_raw_video_format;
@@ -18,6 +19,7 @@ public:
VideoSupplier(); VideoSupplier();
virtual ~VideoSupplier(); virtual ~VideoSupplier();
virtual const media_format& Format() const = 0;
virtual status_t FillBuffer(int64 startFrame, void* buffer, virtual status_t FillBuffer(int64 startFrame, void* buffer,
const media_raw_video_format& format, const media_raw_video_format& format,
bool forceGeneration, bool& wasCached) = 0; bool forceGeneration, bool& wasCached) = 0;
src/apps/mediaplayer/supplier/ProxyVideoSupplier.cpp
+7
View File
@@ -28,6 +28,13 @@ ProxyVideoSupplier::~ProxyVideoSupplier()
} }
const media_format&
ProxyVideoSupplier::Format() const
{
return fSupplier->Format();
}
status_t status_t
ProxyVideoSupplier::FillBuffer(int64 startFrame, void* buffer, ProxyVideoSupplier::FillBuffer(int64 startFrame, void* buffer,
const media_raw_video_format& format, bool forceGeneration, const media_raw_video_format& format, bool forceGeneration,
src/apps/mediaplayer/supplier/ProxyVideoSupplier.h
+1
View File
@@ -18,6 +18,7 @@ public:
ProxyVideoSupplier(); ProxyVideoSupplier();
virtual ~ProxyVideoSupplier(); virtual ~ProxyVideoSupplier();
virtual const media_format& Format() const;
virtual status_t FillBuffer(int64 startFrame, void* buffer, virtual status_t FillBuffer(int64 startFrame, void* buffer,
const media_raw_video_format& format, const media_raw_video_format& format,
bool forceGeneration, bool& wasCached); bool forceGeneration, bool& wasCached);