RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/argo_asf: add version_major and version_minor options 

Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
This commit is contained in:
Zane van Iperen 2020-08-05 12:15:30 +10:00
parent a3e9821787
commit 1f9dd53d5d
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libavformat/argo_asf.c
View File

@ -23,6 +23,7 @@
#include "internal.h" #include "internal.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/opt.h"
#define ASF_TAG MKTAG('A', 'S', 'F', '\0') #define ASF_TAG MKTAG('A', 'S', 'F', '\0')
#define ASF_FILE_HEADER_SIZE 24 #define ASF_FILE_HEADER_SIZE 24
@ -63,6 +64,12 @@ typedef struct ArgoASFDemuxContext {
uint32_t blocks_read; uint32_t blocks_read;
} ArgoASFDemuxContext; } ArgoASFDemuxContext;
typedef struct ArgoASFMuxContext {
const AVClass *class;
int version_major;
int version_minor;
} ArgoASFMuxContext;
#if CONFIG_ARGO_ASF_DEMUXER #if CONFIG_ARGO_ASF_DEMUXER
static void argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf) static void argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf)
{ {
@ -312,12 +319,13 @@ static void argo_asf_write_chunk_header(const ArgoASFChunkHeader *ckhdr, AVIOCon
static int argo_asf_write_header(AVFormatContext *s) static int argo_asf_write_header(AVFormatContext *s)
{ {
const AVCodecParameters *par = s->streams[0]->codecpar; const AVCodecParameters *par = s->streams[0]->codecpar;
ArgoASFMuxContext *ctx = s->priv_data;
ArgoASFFileHeader fhdr; ArgoASFFileHeader fhdr;
ArgoASFChunkHeader chdr; ArgoASFChunkHeader chdr;
fhdr.magic = ASF_TAG; fhdr.magic = ASF_TAG;
fhdr.version_major = 2; fhdr.version_major = (uint16_t)ctx->version_major;
fhdr.version_minor = 1; fhdr.version_minor = (uint16_t)ctx->version_minor;
fhdr.num_chunks = 1; fhdr.num_chunks = 1;
fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; fhdr.chunk_offset = ASF_FILE_HEADER_SIZE;
strncpy(fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(fhdr.name)); strncpy(fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(fhdr.name));
@ -360,6 +368,37 @@ static int argo_asf_write_trailer(AVFormatContext *s)
return 0; return 0;
} }
static const AVOption argo_asf_options[] = {
{
.name = "version_major",
.help = "override file major version",
.offset = offsetof(ArgoASFMuxContext, version_major),
.type = AV_OPT_TYPE_INT,
.default_val = {.i64 = 2},
.min = 0,
.max = UINT16_MAX,
.flags = AV_OPT_FLAG_ENCODING_PARAM
},
{
.name = "version_minor",
.help = "override file minor version",
.offset = offsetof(ArgoASFMuxContext, version_minor),
.type = AV_OPT_TYPE_INT,
.default_val = {.i64 = 1},
.min = 0,
.max = UINT16_MAX,
.flags = AV_OPT_FLAG_ENCODING_PARAM
},
{ NULL }
};
static const AVClass argo_asf_muxer_class = {
.class_name = "argo_asf_muxer",
.item_name = av_default_item_name,
.option = argo_asf_options,
.version = LIBAVUTIL_VERSION_INT
};
AVOutputFormat ff_argo_asf_muxer = { AVOutputFormat ff_argo_asf_muxer = {
.name = "argo_asf", .name = "argo_asf",
.long_name = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"), .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"),
@ -372,6 +411,8 @@ AVOutputFormat ff_argo_asf_muxer = {
.init = argo_asf_write_init, .init = argo_asf_write_init,
.write_header = argo_asf_write_header, .write_header = argo_asf_write_header,
.write_packet = argo_asf_write_packet, .write_packet = argo_asf_write_packet,
.write_trailer = argo_asf_write_trailer .write_trailer = argo_asf_write_trailer,
.priv_class = &argo_asf_muxer_class,
.priv_data_size = sizeof(ArgoASFMuxContext)
}; };
#endif #endif