Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
2e586079
Commit
2e586079
authored
6 years ago
by
Steven Liu
Browse files
Options
Downloads
Patches
Plain Diff
Revert "lavf: add raw AVS2 demuxer"
This reverts commit
1e20ed43
.
parent
1e20ed43
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavformat/Makefile
+0
-1
0 additions, 1 deletion
libavformat/Makefile
libavformat/allformats.c
+0
-1
0 additions, 1 deletion
libavformat/allformats.c
libavformat/davs2.c
+0
-71
0 additions, 71 deletions
libavformat/davs2.c
with
0 additions
and
73 deletions
libavformat/Makefile
+
0
−
1
View file @
2e586079
...
...
@@ -115,7 +115,6 @@ OBJS-$(CONFIG_AVI_MUXER) += avienc.o mpegtsenc.o avlanguage.o ra
OBJS-$(CONFIG_AVM2_MUXER)
+=
swfenc.o swf.o
OBJS-$(CONFIG_AVR_DEMUXER)
+=
avr.o pcm.o
OBJS-$(CONFIG_AVS_DEMUXER)
+=
avs.o voc_packet.o vocdec.o voc.o
OBJS-$(CONFIG_AVS2_DEMUXER)
+=
davs2.o rawdec.o
OBJS-$(CONFIG_AVS2_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)
+=
bethsoftvid.o
OBJS-$(CONFIG_BFI_DEMUXER)
+=
bfi.o
...
...
This diff is collapsed.
Click to expand it.
libavformat/allformats.c
+
0
−
1
View file @
2e586079
...
...
@@ -76,7 +76,6 @@ extern AVInputFormat ff_avisynth_demuxer;
extern
AVOutputFormat
ff_avm2_muxer
;
extern
AVInputFormat
ff_avr_demuxer
;
extern
AVInputFormat
ff_avs_demuxer
;
extern
AVInputFormat
ff_avs2_demuxer
;
extern
AVOutputFormat
ff_avs2_muxer
;
extern
AVInputFormat
ff_bethsoftvid_demuxer
;
extern
AVInputFormat
ff_bfi_demuxer
;
...
...
This diff is collapsed.
Click to expand it.
libavformat/davs2.c
deleted
100644 → 0
+
0
−
71
View file @
1e20ed43
/*
* AVS2 video stream probe.
*
* Copyright (C) 2018 Huiwen Ren, <hwrenx@126.com>
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include
"avformat.h"
#include
"rawdec.h"
#include
"libavcodec/internal.h"
#include
"libavutil/intreadwrite.h"
#define ISSQH(x) ((x) == 0xB0 )
#define ISEND(x) ((x) == 0xB1 )
#define ISPIC(x) ((x) == 0xB3 || (x) == 0xB6)
#define ISUNIT(x) ( ISSQH(x) || ISEND(x) || (x) == 0xB2 || ISPIC(x) || (x) == 0xB5 || (x) == 0xB7 )
#define ISAVS2(x) ((x) == 0x20 || (x) == 0x22 || (x) == 0x30 || (x) == 0x32 )
static
int
avs2_probe
(
AVProbeData
*
p
)
{
if
(
AV_RB32
(
p
->
buf
)
!=
0x1B0
){
return
0
;
}
uint32_t
code
=
-
1
,
hds
=
0
,
pic
=
0
,
seq
=
0
;
uint8_t
state
=
0
;
const
uint8_t
*
ptr
=
p
->
buf
,
*
end
=
p
->
buf
+
p
->
buf_size
,
*
sqb
=
0
;
while
(
ptr
<
end
)
{
ptr
=
avpriv_find_start_code
(
ptr
,
end
,
&
code
);
state
=
code
&
0xFF
;
if
((
code
&
0xffffff00
)
==
0x100
)
{
if
(
ISUNIT
(
state
))
{
if
(
sqb
&&
!
hds
)
{
hds
=
ptr
-
sqb
;
}
if
(
ISSQH
(
state
))
{
if
(
!
ISAVS2
(
*
ptr
))
return
0
;
sqb
=
ptr
;
seq
++
;
}
else
if
(
ISPIC
(
state
))
{
pic
++
;
}
else
if
(
ISEND
(
state
))
{
break
;
}
}
}
}
if
(
seq
&&
hds
>=
21
&&
pic
){
return
AVPROBE_SCORE_EXTENSION
+
2
;
// more than cavs
}
return
0
;
}
FF_DEF_RAWVIDEO_DEMUXER
(
avs2
,
"raw AVS2-P2/IEEE1857.4"
,
avs2_probe
,
"avs,avs2"
,
AV_CODEC_ID_AVS2
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment