Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

2.0release support HLS AES encryption #1150

Closed
wants to merge 4 commits into from

Conversation

harlanc
Copy link
Contributor

@harlanc harlanc commented Jun 1, 2018

No description provided.

/**
* convert data string to hex.
*/
extern char *ff_data_to_hex(char *buff, const uint8_t *src, int s, int lowercase);
Copy link
Contributor

Choose a reason for hiding this comment

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

copy from ffmpeg?
FFmpeg code is LGPL, SRS is MIT, The License is conflicting.

Copy link
Member

Choose a reason for hiding this comment

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

We couldn't accept GPL/LGPL code because SRS is MIT.

Copy link
Contributor Author

@harlanc harlanc Jul 23, 2018

Choose a reason for hiding this comment

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

I saw that the function ff_hex_to_data and ff_hex_to_data come from the same source ?? is that right?then I need to rewrite this function under MIT license??

Copy link
Member

Choose a reason for hiding this comment

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

You should rewrite all code by yourself if it comes from FFMPEG or other GPL/LGPL projects.
Codes from MIT, BSD or Apache projects are ok.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@winlinvip that's okay

Copy link
Contributor Author

@harlanc harlanc Jul 23, 2018

Choose a reason for hiding this comment

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

@winlinvip What is the define of "rewrite",you know that the basic logic of the function must be the same.

Copy link
Member

Choose a reason for hiding this comment

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

You can read the RFC then write code by yourself. You can use FFMPEG to verify your result. We should never copy code from FFMEPG.

@winlinvip
Copy link
Member

winlinvip commented Aug 5, 2018

You should remove ff_hex_to_data.

@T-bagwell Could you please help to check all codes are OK?

TRANS_BY_GPT3

@harlanc
Copy link
Contributor Author

harlanc commented Aug 5, 2018

hi @winlinvip I found ff_hex_to_data is used in srs_rtsp_stack.cpp for other features, so I think it should also be rewritten ,I can do it when I have time...

@winlinvip
Copy link
Member

I will remove it.

@winlinvip
Copy link
Member

BTW, SRS2.0 is released, this feature will be merged to SRS3.

@winlinvip
Copy link
Member

In SRS3, I have removed the GPL/LGPL functions, like ff_hex_to_data and ff_av_base64. I will appreciate if you file this feature to SRS3 branch.

@harlanc
Copy link
Contributor Author

harlanc commented Aug 12, 2018

@winlinvip I merged relevant codes from 2.0 to 3.0 and a PR is already established.

@winlinvip
Copy link
Member

SRS3 will support this feature. #1109

@winlinvip winlinvip closed this Aug 14, 2018
@winlinvip winlinvip added the TransByAI Translated by AI/GPT. label Jul 29, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
TransByAI Translated by AI/GPT.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants