mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

video-raw: set default framerate to 25/1

Browse source
This commit is contained in:
David Svensson Fors 2016-11-03 18:38:13 +01:00 • committed by Wim Taymans
parent 7c127f91a5
commit ddcbca3c4b
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spa/lib/video-raw.c
View file

@ -506,8 +506,8 @@ spa_format_video_init (SpaMediaType type,
static const SpaVideoInfoRaw default_raw_info = { static const SpaVideoInfoRaw default_raw_info = {
SPA_VIDEO_FORMAT_UNKNOWN, SPA_VIDEO_FORMAT_UNKNOWN,
{ 320, 240 }, { 320, 240 },
{ 1, 25 }, { 25, 1 },
{ 1, 25 }, { 25, 1 },
1, 1,
SPA_VIDEO_INTERLACE_MODE_PROGRESSIVE, SPA_VIDEO_INTERLACE_MODE_PROGRESSIVE,
{ 1, 1}, { 1, 1},
@ -536,8 +536,8 @@ spa_format_video_init (SpaMediaType type,
}; };
static const SpaVideoInfoH264 default_h264_info = { static const SpaVideoInfoH264 default_h264_info = {
{ 320, 240 }, { 320, 240 },
{ 1, 25 }, { 25, 1 },
{ 1, 25 } { 25, 1 }
}; };
prop_info = h264_prop_info; prop_info = h264_prop_info;
n_prop_info = SPA_N_ELEMENTS (h264_prop_info); n_prop_info = SPA_N_ELEMENTS (h264_prop_info);
@ -556,8 +556,8 @@ spa_format_video_init (SpaMediaType type,
}; };
static const SpaVideoInfoMJPG default_mjpg_info = { static const SpaVideoInfoMJPG default_mjpg_info = {
{ 320, 240 }, { 320, 240 },
{ 1, 25 }, { 25, 1 },
{ 1, 25 } { 25, 1 }
}; };
prop_info = mjpg_prop_info; prop_info = mjpg_prop_info;
n_prop_info = SPA_N_ELEMENTS (mjpg_prop_info); n_prop_info = SPA_N_ELEMENTS (mjpg_prop_info);

4
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -32,8 +32,8 @@
#include <spa/video/format.h> #include <spa/video/format.h>
#include <lib/props.h> #include <lib/props.h>
#define FRAMES_TO_TIME(this,f) ((this->current_format.info.raw.framerate.num * (f) * SPA_NSEC_PER_SEC) / \ #define FRAMES_TO_TIME(this,f) ((this->current_format.info.raw.framerate.denom * (f) * SPA_NSEC_PER_SEC) / \
(this->current_format.info.raw.framerate.denom)) (this->current_format.info.raw.framerate.num))
#define STATE_GET_IMAGE_WIDTH(this) this->current_format.info.raw.size.width #define STATE_GET_IMAGE_WIDTH(this) this->current_format.info.raw.size.width
#define STATE_GET_IMAGE_HEIGHT(this) this->current_format.info.raw.size.height #define STATE_GET_IMAGE_HEIGHT(this) this->current_format.info.raw.size.height