Skip to content

Conversation

@softworkz
Copy link
Collaborator

@softworkz softworkz commented May 30, 2025

and other cosmetic fixes.

As per review by Ramiro Polla in message:
"Re: [FFmpeg-devel] [FFmpeg-cvslog] fftools/resources: Add resource manager files with build-time compression"

V2

  • Use two-pass decompression to return resources in actual-size memory buffers
    (in response to comment by Kieran)

.

Signed-off-by: softworkz <softworkz@hotmail.com>
@softworkz
Copy link
Collaborator Author

/submit

@ffmpeg-codebot
Copy link

Submitted as pull.90.ffstaging.FFmpeg.1748656229.ffmpegagent@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-90/softworkz/submit_resman_fixes-v1

To fetch this version to local tag pr-ffstaging-90/softworkz/submit_resman_fixes-v1:

git fetch --no-tags https://github.com/ffstaging/FFmpeg tag pr-ffstaging-90/softworkz/submit_resman_fixes-v1

Signed-off-by: softworkz <softworkz@hotmail.com>
@softworkz softworkz force-pushed the submit_resman_fixes branch from 48fc3a6 to 32cd61e Compare May 31, 2025 03:49
@softworkz
Copy link
Collaborator Author

/submit

@ffmpeg-codebot
Copy link

Submitted as pull.90.v2.ffstaging.FFmpeg.1748663925.ffmpegagent@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-90/softworkz/submit_resman_fixes-v2

To fetch this version to local tag pr-ffstaging-90/softworkz/submit_resman_fixes-v2:

git fetch --no-tags https://github.com/ffstaging/FFmpeg tag pr-ffstaging-90/softworkz/submit_resman_fixes-v2

#include <zlib.h>
#endif

#include "resman.h"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the FFmpeg mailing list, Michael Niedermayer wrote (reply to this):


--===============8464981479943917701==
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="lNK9RXEfBTwZsqA6"
Content-Disposition: inline


--lNK9RXEfBTwZsqA6
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi softworkz

On Sat, May 31, 2025 at 03:58:44AM +0000, softworkz wrote:
> From: softworkz <softworkz@hotmail.com>
>=20
> Signed-off-by: softworkz <softworkz@hotmail.com>
> ---
>  fftools/resources/resman.c |  7 +++----
>  fftools/resources/resman.h | 10 +---------
>  2 files changed, 4 insertions(+), 13 deletions(-)

seems to breaks build

fftools/resources/resman.c:60:8: error: unknown type name =E2=80=98AVMutex=
=E2=80=99
   60 | static AVMutex mutex =3D AV_MUTEX_INITIALIZER;
      |        ^~~~~~~
fftools/resources/resman.c:60:24: error: =E2=80=98AV_MUTEX_INITIALIZER=E2=
=80=99 undeclared here (not in a function)
   60 | static AVMutex mutex =3D AV_MUTEX_INITIALIZER;
      |                        ^~~~~~~~~~~~~~~~~~~~
fftools/resources/resman.c: In function =E2=80=98get_resman_context=E2=80=
=99:
fftools/resources/resman.c:123:5: error: implicit declaration of function =
=E2=80=98ff_mutex_lock=E2=80=99 [-Werror=3Dimplicit-function-declaration]
  123 |     ff_mutex_lock(&mutex);
      |     ^~~~~~~~~~~~~
fftools/resources/resman.c:138:5: error: implicit declaration of function =
=E2=80=98ff_mutex_unlock=E2=80=99 [-Werror=3Dimplicit-function-declaration]
  138 |     ff_mutex_unlock(&mutex);
      |     ^~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make: *** [ffbuild/common.mak:81: fftools/resources/resman.o] Error 1
make: *** Waiting for unfinished jobs....


[...]
--=20
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No great genius has ever existed without some touch of madness. -- Aristotle

--lNK9RXEfBTwZsqA6
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaDz+MwAKCRBhHseHBAsP
q3gSAJ9YHbZSYTJ2o7ORJRS6yBl/S5m5HQCbBbAJqgspS0O0gquGV/fyJwLkjrE=
=V/c5
-----END PGP SIGNATURE-----

--lNK9RXEfBTwZsqA6--

--===============8464981479943917701==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
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".

--===============8464981479943917701==--

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the FFmpeg mailing list, "softworkz ." wrote (reply to this):



> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Michael
> Niedermayer
> Sent: Montag, 2. Juni 2025 03:28
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v2 1/2] fftools/resman: remove unused
> includes, fix declaration
> 
> Hi softworkz
> 
> On Sat, May 31, 2025 at 03:58:44AM +0000, softworkz wrote:
> > From: softworkz <softworkz@hotmail.com>
> >
> > Signed-off-by: softworkz <softworkz@hotmail.com>
> > ---
> >  fftools/resources/resman.c |  7 +++----
> >  fftools/resources/resman.h | 10 +---------
> >  2 files changed, 4 insertions(+), 13 deletions(-)
> 
> seems to breaks build
> 
> fftools/resources/resman.c:60:8: error: unknown type name ‘AVMutex’
>    60 | static AVMutex mutex = AV_MUTEX_INITIALIZER;
>       |        ^~~~~~~
> fftools/resources/resman.c:60:24: error: ‘AV_MUTEX_INITIALIZER’ undeclared
> here (not in a function)
>    60 | static AVMutex mutex = AV_MUTEX_INITIALIZER;
>       |                        ^~~~~~~~~~~~~~~~~~~~
> fftools/resources/resman.c: In function ‘get_resman_context’:
> fftools/resources/resman.c:123:5: error: implicit declaration of function
> ‘ff_mutex_lock’ [-Werror=implicit-function-declaration]
>   123 |     ff_mutex_lock(&mutex);
>       |     ^~~~~~~~~~~~~
> fftools/resources/resman.c:138:5: error: implicit declaration of function
> ‘ff_mutex_unlock’ [-Werror=implicit-function-declaration]
>   138 |     ff_mutex_unlock(&mutex);
>       |     ^~~~~~~~~~~~~~~
> cc1: some warnings being treated as errors
> make: *** [ffbuild/common.mak:81: fftools/resources/resman.o] Error 1
> make: *** Waiting for unfinished jobs....
> 
> 
> [...]
> --

Thanks!

Seems it got broken due to changes in master. On submission,
all builds were successful:
https://patchwork.ffmpeg.org/project/ffmpeg/patch/4d7af186ce9f8a8d3b12cdc2c979ea54320eed96.1748663925.git.ffmpegagent@gmail.com/

Will post an update.

Thanks
sw

_______________________________________________
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".

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the FFmpeg mailing list, "softworkz ." wrote (reply to this):



> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of softworkz .
> Sent: Montag, 2. Juni 2025 03:43
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v2 1/2] fftools/resman: remove unused
> includes, fix declaration
> 
> 
> 
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Michael
> > Niedermayer
> > Sent: Montag, 2. Juni 2025 03:28
> > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> > Subject: Re: [FFmpeg-devel] [PATCH v2 1/2] fftools/resman: remove unused
> > includes, fix declaration
> >
> > Hi softworkz
> >
> > On Sat, May 31, 2025 at 03:58:44AM +0000, softworkz wrote:
> > > From: softworkz <softworkz@hotmail.com>
> > >
> > > Signed-off-by: softworkz <softworkz@hotmail.com>
> > > ---
> > >  fftools/resources/resman.c |  7 +++----
> > >  fftools/resources/resman.h | 10 +---------
> > >  2 files changed, 4 insertions(+), 13 deletions(-)
> >
> > seems to breaks build
> >
> > fftools/resources/resman.c:60:8: error: unknown type name ‘AVMutex’
> >    60 | static AVMutex mutex = AV_MUTEX_INITIALIZER;
> >       |        ^~~~~~~
> > fftools/resources/resman.c:60:24: error: ‘AV_MUTEX_INITIALIZER’ undeclared
> > here (not in a function)
> >    60 | static AVMutex mutex = AV_MUTEX_INITIALIZER;
> >       |                        ^~~~~~~~~~~~~~~~~~~~
> > fftools/resources/resman.c: In function ‘get_resman_context’:
> > fftools/resources/resman.c:123:5: error: implicit declaration of function
> > ‘ff_mutex_lock’ [-Werror=implicit-function-declaration]
> >   123 |     ff_mutex_lock(&mutex);
> >       |     ^~~~~~~~~~~~~
> > fftools/resources/resman.c:138:5: error: implicit declaration of function
> > ‘ff_mutex_unlock’ [-Werror=implicit-function-declaration]
> >   138 |     ff_mutex_unlock(&mutex);
> >       |     ^~~~~~~~~~~~~~~
> > cc1: some warnings being treated as errors
> > make: *** [ffbuild/common.mak:81: fftools/resources/resman.o] Error 1
> > make: *** Waiting for unfinished jobs....
> >
> >
> > [...]
> > --
> 
> Thanks!
> 
> Seems it got broken due to changes in master. On submission,
> all builds were successful:
> https://patchwork.ffmpeg.org/project/ffmpeg/patch/4d7af186ce9f8a8d3b12cdc2c979
> ea54320eed96.1748663925.git.ffmpegagent@gmail.com/
> 
> Will post an update.
> _______________________________________________

No I won't. This set is obsolete and superseded by
https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=14663

sw
_______________________________________________
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".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants