Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
06e1acc1
Commit
06e1acc1
authored
Apr 19, 2007
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/demux/mp4/*, modules/mux/mp4.c: add support for yv12 and yuy2.
parent
4ccb8b80
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
0 deletions
+22
-0
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+3
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+2
-0
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+7
-0
modules/mux/mp4.c
modules/mux/mp4.c
+10
-0
No files found.
modules/demux/mp4/libmp4.c
View file @
06e1acc1
...
...
@@ -2344,6 +2344,9 @@ static struct
{
FOURCC_jpeg
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
},
{
FOURCC_avc1
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
},
{
FOURCC_yv12
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
},
{
FOURCC_yuv2
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
},
{
FOURCC_mp4s
,
MP4_ReadBox_sample_mp4s
,
MP4_FreeBox_Common
},
/* XXX there is 2 box where we could find this entry stbl and tref*/
...
...
modules/demux/mp4/libmp4.h
View file @
06e1acc1
...
...
@@ -155,6 +155,8 @@
#define FOURCC_jpeg VLC_FOURCC( 'j', 'p', 'e', 'g' )
#define FOURCC_yv12 VLC_FOURCC( 'y', 'v', '1', '2' )
#define FOURCC_yuv2 VLC_FOURCC( 'y', 'u', 'v', '2' )
#define FOURCC_rmra VLC_FOURCC( 'r', 'm', 'r', 'a' )
#define FOURCC_rmda VLC_FOURCC( 'r', 'm', 'd', 'a' )
...
...
modules/demux/mp4/mp4.c
View file @
06e1acc1
...
...
@@ -1298,6 +1298,13 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
p_track
->
fmt
.
subs
.
psz_encoding
=
strdup
(
"UTF-8"
);
break
;
case
VLC_FOURCC
(
'y'
,
'v'
,
'1'
,
'2'
):
p_track
->
fmt
.
i_codec
=
VLC_FOURCC
(
'Y'
,
'V'
,
'1'
,
'2'
);
break
;
case
VLC_FOURCC
(
'y'
,
'u'
,
'v'
,
'2'
):
p_track
->
fmt
.
i_codec
=
VLC_FOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
);
break
;
default:
p_track
->
fmt
.
i_codec
=
p_sample
->
i_type
;
break
;
...
...
modules/mux/mp4.c
View file @
06e1acc1
...
...
@@ -406,6 +406,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
case
VLC_FOURCC
(
'h'
,
'2'
,
'6'
,
'4'
):
case
VLC_FOURCC
(
's'
,
'a'
,
'm'
,
'r'
):
case
VLC_FOURCC
(
's'
,
'a'
,
'w'
,
'b'
):
case
VLC_FOURCC
(
'Y'
,
'V'
,
'1'
,
'2'
):
case
VLC_FOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
):
break
;
case
VLC_FOURCC
(
's'
,
'u'
,
'b'
,
't'
):
msg_Warn
(
p_mux
,
"subtitle track added like in .mov (even when creating .mp4)"
);
...
...
@@ -1214,6 +1216,14 @@ static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
memcpy
(
fcc
,
"avc1"
,
4
);
break
;
case
VLC_FOURCC
(
'Y'
,
'V'
,
'1'
,
'2'
):
memcpy
(
fcc
,
"yv12"
,
4
);
break
;
case
VLC_FOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
):
memcpy
(
fcc
,
"yuy2"
,
4
);
break
;
default:
memcpy
(
fcc
,
(
char
*
)
&
p_stream
->
fmt
.
i_codec
,
4
);
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment