Animated PNG Support by sturkmen72 · Pull Request #25715 · opencv/opencv

sturkmen72 · 2024-06-05T16:24:07Z

Continues #25608

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

I agree to contribute to the project under Apache 2 License.
To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
The PR is proposed to the proper branch
There is a reference to the original bug report and related work
There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
The feature is well documented and sample code can be built with the project CMake

sturkmen72 · 2024-06-05T16:38:07Z

@vrabaud i am willing to modify grfmt_apng.cpp to gain a solution.
i think i can work in this way. let me know if there is any problem.

vrabaud · 2024-06-06T12:44:21Z

You probably do not want to modify that file as it will make it harder to track changes upstream. Have it be its own file (apng.cpp? or whatever it was called in the first place). And then have your own grfmt_apng.cpp call it

vrabaud · 2024-06-10T12:43:21Z

@sturkmen72, did you get my mail? You should really first design an API that will handle animations. writemulti is not usable for animations, it misses critical details (e.g. timestamp, loops)

sturkmen72 · 2024-06-25T14:13:56Z

hi @vrabaud
could you take a look the difference of results_test_imgcodecs. any advice on how to handle old versions of libpng

linux ci server

PNG:    /usr/lib/x86_64-linux-gnu/libpng.so (ver 1.2.54)

-------------------
w0 : 680
h0 : 900
x0 : 0
y0 : 0
delay_num : 100
delay_den : 1000
dop : 0
bop : 0
-------------------
[       OK ] Imgcodecs_Png.load_save_multiframes_rgba (1779 ms)
[ RUN      ] Imgcodecs_Png.load_save_multiframes_rgb
**frame props
-------------------
w0 : 680
h0 : 900
x0 : 0
y0 : 0
delay_num : 100
delay_den : 1000
dop : 0
bop : 0
-------------------

windows ci server
-- PNG: build (ver 1.6.43)
-- SIMD Support Request: YES
-- SIMD Support: YES (Intel SSE)

**frame props
-------------------
w0 : 680
h0 : 900
x0 : 0
y0 : 0
delay_num : 100
delay_den : 1000
dop : 0
bop : 0
-------------------
**frame props
-------------------
w0 : 662
h0 : 178
x0 : 9
y0 : 719
delay_num : 100
delay_den : 1000
dop : 1
bop : 0
-------------------

sturkmen72 · 2024-06-25T14:28:44Z

@asmorkalov is it possible to update versions of libpng and libwebp on linux ci servers.

vrabaud

Mostly, please split the code into what was taken from upstream, and what you added, this will make it easier to update files to upstream.

modules/imgcodecs/test/test_png.cpp

vrabaud · 2024-06-25T14:30:17Z

modules/imgcodecs/src/grfmt_apng.cpp

+            m_height = height;
+            m_color_type = PNG_COLOR_MASK_COLOR;
+
+            m_pixels = new uchar[m_height * rowbytes];


please use C++ to make it easier to track memory (std::vector here)

vrabaud · 2024-06-25T14:31:12Z

modules/imgcodecs/src/grfmt_apng.cpp

+
+/****************************************************************************\
+ *
+ *  this file includes some modified part of apngasm and APNG Optimizer 1.4


Can't the relevant code simply be copied from upstream? It will make it much easier to track upstream bug fixes. Which files did you take from upstream?

modules/imgcodecs/src/grfmt_apng.hpp

modules/imgcodecs/src/grfmt_png.hpp

modules/imgcodecs/src/grfmt_png.cpp

sturkmen72 · 2024-06-25T15:44:10Z

@vrabaud thank you for review. the PR is still a draft and not yet completely functional. i will take your remarks in account.

vrabaud · 2024-06-28T12:24:19Z

modules/imgcodecs/src/apngframe.hpp

+ *  The next generation of apngasm, the APNG Assembler.
+ *  The apngasm CLI tool and library can assemble and disassemble APNG image files.
+ *
+ *  https://github.com/apngasm/apngasm


How about mentioning which file got copied? Ideally, the first commit would be about adding the pristine file from upstream, and you would then have a commit to modify it to make sure we know what got modified.

modules/imgcodecs/src/apngframe.hpp

modules/imgcodecs/test/test_png.cpp

modules/imgcodecs/src/grfmt_png.cpp

vrabaud · 2024-06-28T13:18:04Z

modules/imgcodecs/src/grfmt_png.cpp

+        if (pChunk->size > PNG_USER_CHUNK_MALLOC_MAX)
+            return 0;
+        pChunk->size += 12;
+        pChunk->p = new uchar[pChunk->size];


Please do not use new as it makes its hard to track memory. Use std::vector if you can.

modules/imgcodecs/test/test_png.cpp

modules/imgcodecs/src/grfmt_png.hpp

modules/imgcodecs/include/opencv2/imgcodecs.hpp

modules/imgcodecs/src/grfmt_png.hpp

modules/imgcodecs/test/test_png.cpp

asmorkalov · 2024-09-23T07:51:11Z

@sturkmen72 Looks like Obj-C / Swift bindings generator does not handle uint32_t correctly. Please try to get rid of it in interface:

Traceback (most recent call last):
  File "/Users/opencv-cn/GHA-OCV-3/_work/opencv/opencv/opencv/modules/objc/generator/../generator/gen_objc.py", line 1716, in <module>
    generator.gen(srcfiles, module, dstdir, objc_base_path, common_headers, manual_classes)
  File "/Users/opencv-cn/GHA-OCV-3/_work/opencv/opencv/opencv/modules/objc/generator/../generator/gen_objc.py", line 953, in gen
    self.gen_class(ci, self.module, extension_implementations, extension_signatures)
  File "/Users/opencv-cn/GHA-OCV-3/_work/opencv/opencv/opencv/modules/objc/generator/../generator/gen_objc.py", line 1349, in gen_class
    type_data = type_dict[pi.ctype] if pi.ctype != "uchar" else {"objc_type" : "unsigned char", "is_primitive" : True}
KeyError: 'uint32_t'

asmorkalov · 2024-12-20T10:30:15Z

@sturkmen72 I merged your patch for webp/avif. Please rebase and fix conflicts.

sturkmen72 · 2024-12-23T09:45:52Z

@asmorkalov there is 3 issues i am working on hopefully be completed soon.

background color ( Marked TO DO on test )
imdecode ( Marked TO DO on test )
when saving identical frames drop frame and calculate delay ( like WebP ).

sturkmen72 · 2024-12-25T20:20:55Z

@asmorkalov @vrabaud i believe the PR is ready for final review.

Animated PNG Support opencv#25715 Continues opencv#25608 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake

Resolves #26913 Related(?): #25715 #26832

Animated PNG Support opencv#25715 Continues opencv#25608 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake

Resolves opencv#26913 Related(?): opencv#25715 opencv#26832

sturkmen72 marked this pull request as draft June 5, 2024 20:54

asmorkalov added category: imgcodecs GSoC labels Jun 11, 2024

sturkmen72 force-pushed the apng_support branch from 36f624d to fc01058 Compare June 11, 2024 17:31

sturkmen72 force-pushed the apng_support branch from 648dfd4 to 70921f9 Compare June 20, 2024 19:32

vrabaud reviewed Jun 25, 2024

View reviewed changes

vrabaud reviewed Jun 28, 2024

View reviewed changes

asmorkalov added this to the 4.11.0 milestone Jul 12, 2024

sturkmen72 force-pushed the apng_support branch 2 times, most recently from ba23302 to 2ec4b67 Compare July 18, 2024 06:53

sturkmen72 force-pushed the apng_support branch 3 times, most recently from 8a5311c to 946a110 Compare July 27, 2024 16:53

sturkmen72 force-pushed the apng_support branch from 32dd3ec to 4ea9b1c Compare August 11, 2024 21:21

sturkmen72 marked this pull request as ready for review August 12, 2024 07:59

sturkmen72 changed the title ~~APNG Support~~ Animated PNG Support Aug 26, 2024

vrabaud reviewed Aug 27, 2024

View reviewed changes

sturkmen72 force-pushed the apng_support branch 2 times, most recently from 2daf9da to 5f716bd Compare August 27, 2024 19:19

sturkmen72 force-pushed the apng_support branch from f22861e to 227c56f Compare September 17, 2024 20:00

sturkmen72 force-pushed the apng_support branch from a3e42bc to 20083ab Compare December 14, 2024 09:29

asmorkalov self-assigned this Dec 17, 2024

sturkmen72 added 11 commits December 22, 2024 01:38

Update grfmt_png.cpp

d12f27f

Update test_animation.cpp

d9470b6

Update test_animation.cpp

2a7bcd1

Update grfmt_png.cpp

0d12a24

Update grfmt_png.cpp

2722af4

Update grfmt_png.cpp

98966ba

use AutoBuffer

acd2923

clean up

49b5757

Update grfmt_png.cpp

d4ab089

Update grfmt_png.cpp

a5bd859

Update test_animation.cpp

3af87d0

sturkmen72 added 6 commits December 23, 2024 16:12

use bKGD chunk to save Animation.bgcolor

09bb085

imdecode

4ed0eb7

Update grfmt_png.cpp

c1b906a

Update test_animation.cpp

2d52c52

Update test_animation.cpp

7d32bdb

drop duplicate frames

1f32aff

clean up the code

3e2f078

sturkmen72 force-pushed the apng_support branch from d1c78d5 to 3e2f078 Compare December 28, 2024 22:30

asmorkalov approved these changes Dec 29, 2024

View reviewed changes

asmorkalov merged commit 8bc65a1 into opencv:4.x Dec 30, 2024

sturkmen72 deleted the apng_support branch December 30, 2024 08:53

asmorkalov mentioned this pull request Jan 15, 2025

5.x merge 4.x #26768

Merged

mshabunin mentioned this pull request Feb 12, 2025

imgcodecs: fix PNG read on BE platforms (s390x) #26915

Merged

asmorkalov pushed a commit that referenced this pull request Feb 13, 2025

Merge pull request #26915 from mshabunin:fix-png-be

45aa502

Resolves #26913 Related(?): #25715 #26832

NanQin555 pushed a commit to NanQin555/opencv that referenced this pull request Feb 24, 2025

Merge pull request opencv#26915 from mshabunin:fix-png-be

566b3a2

Resolves opencv#26913 Related(?): opencv#25715 opencv#26832

Uh oh!

Conversation

sturkmen72 commented Jun 5, 2024 • edited by asmorkalov Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Readiness Checklist

Uh oh!

sturkmen72 commented Jun 5, 2024

Uh oh!

vrabaud commented Jun 6, 2024

Uh oh!

vrabaud commented Jun 10, 2024

Uh oh!

sturkmen72 commented Jun 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sturkmen72 commented Jun 25, 2024

Uh oh!

vrabaud left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vrabaud Jun 25, 2024

Choose a reason for hiding this comment

Uh oh!

vrabaud Jun 25, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sturkmen72 commented Jun 25, 2024

Uh oh!

vrabaud Jun 28, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vrabaud Jun 28, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

asmorkalov commented Sep 23, 2024

Uh oh!

asmorkalov commented Dec 20, 2024

Uh oh!

sturkmen72 commented Dec 23, 2024

Uh oh!

sturkmen72 commented Dec 25, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sturkmen72 commented Jun 5, 2024 •

edited by asmorkalov

Loading

sturkmen72 commented Jun 25, 2024 •

edited

Loading