* [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers
@ 2023-09-04 13:44 Andreas Rheinhardt
2023-09-04 13:45 ` [FFmpeg-devel] [PATCH 2/2] avcodec/rv34_parser: Remove unused ParseContext Andreas Rheinhardt
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2023-09-04 13:44 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
They do mostly the same.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/Makefile | 3 +--
libavcodec/parsers.c | 3 +--
libavcodec/rv34_parser.c | 16 ++--------------
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 08fd151619..bf3b0a93f9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) += opus_parser.o opus_parse.o \
OBJS-$(CONFIG_PNG_PARSER) += png_parser.o
OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o
-OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o
-OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o
+OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o
OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o
OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o
OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o
diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
index a663b9e253..5128009cd4 100644
--- a/libavcodec/parsers.c
+++ b/libavcodec/parsers.c
@@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser;
extern const AVCodecParser ff_png_parser;
extern const AVCodecParser ff_pnm_parser;
extern const AVCodecParser ff_qoi_parser;
-extern const AVCodecParser ff_rv30_parser;
-extern const AVCodecParser ff_rv40_parser;
+extern const AVCodecParser ff_rv34_parser;
extern const AVCodecParser ff_sbc_parser;
extern const AVCodecParser ff_sipr_parser;
extern const AVCodecParser ff_tak_parser;
diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
index e17bc8562d..fbc764c64f 100644
--- a/libavcodec/rv34_parser.c
+++ b/libavcodec/rv34_parser.c
@@ -24,8 +24,6 @@
* RV30/40 parser
*/
-#include "config_components.h"
-
#include "parser.h"
#include "libavutil/intreadwrite.h"
@@ -78,18 +76,8 @@ static int rv34_parse(AVCodecParserContext *s,
return buf_size;
}
-#if CONFIG_RV30_PARSER
-const AVCodecParser ff_rv30_parser = {
- .codec_ids = { AV_CODEC_ID_RV30 },
- .priv_data_size = sizeof(RV34ParseContext),
- .parser_parse = rv34_parse,
-};
-#endif
-
-#if CONFIG_RV40_PARSER
-const AVCodecParser ff_rv40_parser = {
- .codec_ids = { AV_CODEC_ID_RV40 },
+const AVCodecParser ff_rv34_parser = {
+ .codec_ids = { AV_CODEC_ID_RV30, AV_CODEC_ID_RV40 },
.priv_data_size = sizeof(RV34ParseContext),
.parser_parse = rv34_parse,
};
-#endif
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* [FFmpeg-devel] [PATCH 2/2] avcodec/rv34_parser: Remove unused ParseContext
2023-09-04 13:44 [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers Andreas Rheinhardt
@ 2023-09-04 13:45 ` Andreas Rheinhardt
2023-09-04 13:49 ` [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers James Almer
2023-09-06 9:36 ` Andreas Rheinhardt
2 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2023-09-04 13:45 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This parser does not do frame packetization at all.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/rv34_parser.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
index fbc764c64f..2997a4db70 100644
--- a/libavcodec/rv34_parser.c
+++ b/libavcodec/rv34_parser.c
@@ -24,11 +24,10 @@
* RV30/40 parser
*/
-#include "parser.h"
+#include "avcodec.h"
#include "libavutil/intreadwrite.h"
typedef struct RV34ParseContext {
- ParseContext pc;
int64_t key_dts;
int key_pts;
} RV34ParseContext;
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers
2023-09-04 13:44 [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers Andreas Rheinhardt
2023-09-04 13:45 ` [FFmpeg-devel] [PATCH 2/2] avcodec/rv34_parser: Remove unused ParseContext Andreas Rheinhardt
@ 2023-09-04 13:49 ` James Almer
2023-09-04 13:56 ` Andreas Rheinhardt
2023-09-06 9:36 ` Andreas Rheinhardt
2 siblings, 1 reply; 5+ messages in thread
From: James Almer @ 2023-09-04 13:49 UTC (permalink / raw)
To: ffmpeg-devel
On 9/4/2023 10:44 AM, Andreas Rheinhardt wrote:
> They do mostly the same.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavcodec/Makefile | 3 +--
> libavcodec/parsers.c | 3 +--
> libavcodec/rv34_parser.c | 16 ++--------------
> 3 files changed, 4 insertions(+), 18 deletions(-)
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 08fd151619..bf3b0a93f9 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) += opus_parser.o opus_parse.o \
> OBJS-$(CONFIG_PNG_PARSER) += png_parser.o
> OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
> OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o
> -OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o
> -OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o
> +OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o
> OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o
> OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o
> OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o
> diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
> index a663b9e253..5128009cd4 100644
> --- a/libavcodec/parsers.c
> +++ b/libavcodec/parsers.c
> @@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser;
> extern const AVCodecParser ff_png_parser;
> extern const AVCodecParser ff_pnm_parser;
> extern const AVCodecParser ff_qoi_parser;
> -extern const AVCodecParser ff_rv30_parser;
> -extern const AVCodecParser ff_rv40_parser;
> +extern const AVCodecParser ff_rv34_parser;
This afaik will break command lines like "--disable-parsers
--enable-parser=rv30".
I don't particularly care, or think anyone will care, but letting you
know just in case.
> extern const AVCodecParser ff_sbc_parser;
> extern const AVCodecParser ff_sipr_parser;
> extern const AVCodecParser ff_tak_parser;
> diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
> index e17bc8562d..fbc764c64f 100644
> --- a/libavcodec/rv34_parser.c
> +++ b/libavcodec/rv34_parser.c
> @@ -24,8 +24,6 @@
> * RV30/40 parser
> */
>
> -#include "config_components.h"
> -
> #include "parser.h"
> #include "libavutil/intreadwrite.h"
>
> @@ -78,18 +76,8 @@ static int rv34_parse(AVCodecParserContext *s,
> return buf_size;
> }
>
> -#if CONFIG_RV30_PARSER
> -const AVCodecParser ff_rv30_parser = {
> - .codec_ids = { AV_CODEC_ID_RV30 },
> - .priv_data_size = sizeof(RV34ParseContext),
> - .parser_parse = rv34_parse,
> -};
> -#endif
> -
> -#if CONFIG_RV40_PARSER
> -const AVCodecParser ff_rv40_parser = {
> - .codec_ids = { AV_CODEC_ID_RV40 },
> +const AVCodecParser ff_rv34_parser = {
> + .codec_ids = { AV_CODEC_ID_RV30, AV_CODEC_ID_RV40 },
> .priv_data_size = sizeof(RV34ParseContext),
> .parser_parse = rv34_parse,
> };
> -#endif
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers
2023-09-04 13:49 ` [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers James Almer
@ 2023-09-04 13:56 ` Andreas Rheinhardt
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2023-09-04 13:56 UTC (permalink / raw)
To: ffmpeg-devel
James Almer:
> On 9/4/2023 10:44 AM, Andreas Rheinhardt wrote:
>> They do mostly the same.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> libavcodec/Makefile | 3 +--
>> libavcodec/parsers.c | 3 +--
>> libavcodec/rv34_parser.c | 16 ++--------------
>> 3 files changed, 4 insertions(+), 18 deletions(-)
>>
>> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
>> index 08fd151619..bf3b0a93f9 100644
>> --- a/libavcodec/Makefile
>> +++ b/libavcodec/Makefile
>> @@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) +=
>> opus_parser.o opus_parse.o \
>> OBJS-$(CONFIG_PNG_PARSER) += png_parser.o
>> OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
>> OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o
>> -OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o
>> -OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o
>> +OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o
>> OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o
>> OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o
>> OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o
>> diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
>> index a663b9e253..5128009cd4 100644
>> --- a/libavcodec/parsers.c
>> +++ b/libavcodec/parsers.c
>> @@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser;
>> extern const AVCodecParser ff_png_parser;
>> extern const AVCodecParser ff_pnm_parser;
>> extern const AVCodecParser ff_qoi_parser;
>> -extern const AVCodecParser ff_rv30_parser;
>> -extern const AVCodecParser ff_rv40_parser;
>> +extern const AVCodecParser ff_rv34_parser;
>
> This afaik will break command lines like "--disable-parsers
> --enable-parser=rv30".
> I don't particularly care, or think anyone will care, but letting you
> know just in case.
>
I am aware of that; I also don't care. AFAIK we don't give guarantees on
that.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers
2023-09-04 13:44 [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers Andreas Rheinhardt
2023-09-04 13:45 ` [FFmpeg-devel] [PATCH 2/2] avcodec/rv34_parser: Remove unused ParseContext Andreas Rheinhardt
2023-09-04 13:49 ` [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers James Almer
@ 2023-09-06 9:36 ` Andreas Rheinhardt
2 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2023-09-06 9:36 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> They do mostly the same.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavcodec/Makefile | 3 +--
> libavcodec/parsers.c | 3 +--
> libavcodec/rv34_parser.c | 16 ++--------------
> 3 files changed, 4 insertions(+), 18 deletions(-)
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 08fd151619..bf3b0a93f9 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) += opus_parser.o opus_parse.o \
> OBJS-$(CONFIG_PNG_PARSER) += png_parser.o
> OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
> OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o
> -OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o
> -OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o
> +OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o
> OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o
> OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o
> OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o
> diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
> index a663b9e253..5128009cd4 100644
> --- a/libavcodec/parsers.c
> +++ b/libavcodec/parsers.c
> @@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser;
> extern const AVCodecParser ff_png_parser;
> extern const AVCodecParser ff_pnm_parser;
> extern const AVCodecParser ff_qoi_parser;
> -extern const AVCodecParser ff_rv30_parser;
> -extern const AVCodecParser ff_rv40_parser;
> +extern const AVCodecParser ff_rv34_parser;
> extern const AVCodecParser ff_sbc_parser;
> extern const AVCodecParser ff_sipr_parser;
> extern const AVCodecParser ff_tak_parser;
> diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
> index e17bc8562d..fbc764c64f 100644
> --- a/libavcodec/rv34_parser.c
> +++ b/libavcodec/rv34_parser.c
> @@ -24,8 +24,6 @@
> * RV30/40 parser
> */
>
> -#include "config_components.h"
> -
> #include "parser.h"
> #include "libavutil/intreadwrite.h"
>
> @@ -78,18 +76,8 @@ static int rv34_parse(AVCodecParserContext *s,
> return buf_size;
> }
>
> -#if CONFIG_RV30_PARSER
> -const AVCodecParser ff_rv30_parser = {
> - .codec_ids = { AV_CODEC_ID_RV30 },
> - .priv_data_size = sizeof(RV34ParseContext),
> - .parser_parse = rv34_parse,
> -};
> -#endif
> -
> -#if CONFIG_RV40_PARSER
> -const AVCodecParser ff_rv40_parser = {
> - .codec_ids = { AV_CODEC_ID_RV40 },
> +const AVCodecParser ff_rv34_parser = {
> + .codec_ids = { AV_CODEC_ID_RV30, AV_CODEC_ID_RV40 },
> .priv_data_size = sizeof(RV34ParseContext),
> .parser_parse = rv34_parse,
> };
> -#endif
Will apply this patchset tomorrow unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-06 9:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-04 13:44 [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers Andreas Rheinhardt
2023-09-04 13:45 ` [FFmpeg-devel] [PATCH 2/2] avcodec/rv34_parser: Remove unused ParseContext Andreas Rheinhardt
2023-09-04 13:49 ` [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers James Almer
2023-09-04 13:56 ` Andreas Rheinhardt
2023-09-06 9:36 ` Andreas Rheinhardt
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git