Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
ceab04fb
Commit
ceab04fb
authored
Aug 12, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/raw: Support QT b64a ARGB64 rawvideo.
Decoder based on a patch by v0lt, v0lt rambler ru Fixes ticket #5657.
parent
bc703126
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
2 deletions
+23
-2
raw.c
libavcodec/raw.c
+1
-0
rawdec.c
libavcodec/rawdec.c
+11
-0
rawenc.c
libavcodec/rawenc.c
+8
-0
version.h
libavcodec/version.h
+1
-1
isom.c
libavformat/isom.c
+1
-0
version.h
libavformat/version.h
+1
-1
No files found.
libavcodec/raw.c
View file @
ceab04fb
...
...
@@ -225,6 +225,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{
AV_PIX_FMT_ABGR
,
MKTAG
(
'A'
,
'B'
,
'G'
,
'R'
)
},
{
AV_PIX_FMT_GRAY16BE
,
MKTAG
(
'b'
,
'1'
,
'6'
,
'g'
)
},
{
AV_PIX_FMT_RGB48BE
,
MKTAG
(
'b'
,
'4'
,
'8'
,
'r'
)
},
{
AV_PIX_FMT_RGBA64BE
,
MKTAG
(
'b'
,
'6'
,
'4'
,
'a'
)
},
/* vlc */
{
AV_PIX_FMT_YUV410P
,
MKTAG
(
'I'
,
'4'
,
'1'
,
'0'
)
},
...
...
libavcodec/rawdec.c
View file @
ceab04fb
...
...
@@ -453,6 +453,17 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
}
}
if
(
avctx
->
codec_tag
==
AV_RL32
(
"b64a"
)
&&
avctx
->
pix_fmt
==
AV_PIX_FMT_RGBA64BE
)
{
uint8_t
*
dst
=
frame
->
data
[
0
];
uint64_t
v
;
int
x
;
for
(
x
=
0
;
x
>>
3
<
avctx
->
width
*
avctx
->
height
;
x
+=
8
)
{
v
=
AV_RB64
(
&
dst
[
x
]);
AV_WB64
(
&
dst
[
x
],
v
<<
16
|
v
>>
48
);
}
}
if
(
avctx
->
field_order
>
AV_FIELD_PROGRESSIVE
)
{
/* we have interlaced material flagged in container */
frame
->
interlaced_frame
=
1
;
if
(
avctx
->
field_order
==
AV_FIELD_TT
||
avctx
->
field_order
==
AV_FIELD_TB
)
...
...
libavcodec/rawenc.c
View file @
ceab04fb
...
...
@@ -69,6 +69,14 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
int
x
;
for
(
x
=
1
;
x
<
frame
->
height
*
frame
->
width
*
2
;
x
+=
2
)
pkt
->
data
[
x
]
^=
0x80
;
}
else
if
(
avctx
->
codec_tag
==
AV_RL32
(
"b64a"
)
&&
ret
>
0
&&
frame
->
format
==
AV_PIX_FMT_RGBA64BE
)
{
uint64_t
v
;
int
x
;
for
(
x
=
0
;
x
<
frame
->
height
*
frame
->
width
;
x
++
)
{
v
=
AV_RB64
(
&
pkt
->
data
[
8
*
x
]);
AV_WB64
(
&
pkt
->
data
[
8
*
x
],
v
<<
48
|
v
>>
16
);
}
}
pkt
->
flags
|=
AV_PKT_FLAG_KEY
;
*
got_packet
=
1
;
...
...
libavcodec/version.h
View file @
ceab04fb
...
...
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 51
#define LIBAVCODEC_VERSION_MICRO 10
1
#define LIBAVCODEC_VERSION_MICRO 10
2
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
libavformat/isom.c
View file @
ceab04fb
...
...
@@ -86,6 +86,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'A'
,
'B'
,
'G'
,
'R'
)
},
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'1'
,
'6'
,
'g'
)
},
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'4'
,
'8'
,
'r'
)
},
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'6'
,
'4'
,
'a'
)
},
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'x'
,
'b'
,
'g'
)
},
/* BOXX */
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'x'
,
'r'
,
'g'
)
},
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'x'
,
'y'
,
'v'
)
},
...
...
libavformat/version.h
View file @
ceab04fb
...
...
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you belive might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 46
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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