Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
d4bff9f1
Commit
d4bff9f1
authored
Oct 25, 2012
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nut: support textual data
Plain text (utf8 encoded) data can be muxed and demuxed in nut.
parent
07585ffa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
1 deletion
+14
-1
nut.texi
doc/nut.texi
+6
-0
nut.c
libavformat/nut.c
+6
-1
nut.h
libavformat/nut.h
+1
-0
nutdec.c
libavformat/nutdec.c
+1
-0
No files found.
doc/nut.texi
View file @
d4bff9f1
...
...
@@ -66,6 +66,12 @@ PFD[32] would for example be signed 32 bit little-endian IEEE float
@item DVBS @tab DVB subtitles
@end multitable
@section Raw Data
@multitable @columnfractions .4 .4
@item UTF8 @tab Raw UTF-8
@end multitable
@section Codecs
@multitable @columnfractions .4 .4
...
...
libavformat/nut.c
View file @
d4bff9f1
...
...
@@ -33,6 +33,11 @@ const AVCodecTag ff_nut_subtitle_tags[] = {
{
AV_CODEC_ID_NONE
,
0
}
};
const
AVCodecTag
ff_nut_data_tags
[]
=
{
{
AV_CODEC_ID_TEXT
,
MKTAG
(
'U'
,
'T'
,
'F'
,
'8'
)
},
{
AV_CODEC_ID_NONE
,
0
}
};
const
AVCodecTag
ff_nut_video_tags
[]
=
{
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'R'
,
'G'
,
'B'
,
15
)
},
{
AV_CODEC_ID_RAWVIDEO
,
MKTAG
(
'B'
,
'G'
,
'R'
,
15
)
},
...
...
@@ -117,7 +122,7 @@ const AVCodecTag ff_nut_audio_tags[] = {
const
AVCodecTag
*
const
ff_nut_codec_tags
[]
=
{
ff_nut_video_tags
,
ff_nut_audio_tags
,
ff_nut_subtitle_tags
,
ff_codec_bmp_tags
,
ff_codec_wav_tags
,
0
ff_codec_bmp_tags
,
ff_codec_wav_tags
,
ff_nut_data_tags
,
0
};
void
ff_nut_reset_ts
(
NUTContext
*
nut
,
AVRational
time_base
,
int64_t
val
){
...
...
libavformat/nut.h
View file @
d4bff9f1
...
...
@@ -106,6 +106,7 @@ typedef struct NUTContext {
extern
const
AVCodecTag
ff_nut_subtitle_tags
[];
extern
const
AVCodecTag
ff_nut_video_tags
[];
extern
const
AVCodecTag
ff_nut_audio_tags
[];
extern
const
AVCodecTag
ff_nut_data_tags
[];
extern
const
AVCodecTag
*
const
ff_nut_codec_tags
[];
...
...
libavformat/nutdec.c
View file @
d4bff9f1
...
...
@@ -371,6 +371,7 @@ static int decode_stream_header(NUTContext *nut)
break
;
case
3
:
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_DATA
;
st
->
codec
->
codec_id
=
ff_codec_get_id
(
ff_nut_data_tags
,
tmp
);
break
;
default:
av_log
(
s
,
AV_LOG_ERROR
,
"unknown stream class (%d)
\n
"
,
class
);
...
...
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