mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-06 15:49:50 +08:00
Make ff_random_get_seed public, rename to av_get_random_seed, export the header
Keep an old ff_ named function for binary compatibility until the next major bump. Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@ -4612,7 +4612,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
unsetenv("http_proxy"); /* Kill the http_proxy */
|
unsetenv("http_proxy"); /* Kill the http_proxy */
|
||||||
|
|
||||||
av_lfg_init(&random_state, ff_random_get_seed());
|
av_lfg_init(&random_state, av_get_random_seed());
|
||||||
|
|
||||||
memset(&sigact, 0, sizeof(sigact));
|
memset(&sigact, 0, sizeof(sigact));
|
||||||
sigact.sa_handler = handle_child_exit;
|
sigact.sa_handler = handle_child_exit;
|
||||||
|
@ -218,7 +218,7 @@ static int color_table_compare(const void *lhs, const void *rhs)
|
|||||||
int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx)
|
int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx)
|
||||||
{
|
{
|
||||||
if (!strcasecmp(color_string, "random") || !strcasecmp(color_string, "bikeshed")) {
|
if (!strcasecmp(color_string, "random") || !strcasecmp(color_string, "bikeshed")) {
|
||||||
int rgba = ff_random_get_seed();
|
int rgba = av_get_random_seed();
|
||||||
rgba_color[0] = rgba >> 24;
|
rgba_color[0] = rgba >> 24;
|
||||||
rgba_color[1] = rgba >> 16;
|
rgba_color[1] = rgba >> 16;
|
||||||
rgba_color[2] = rgba >> 8;
|
rgba_color[2] = rgba >> 8;
|
||||||
|
@ -200,7 +200,7 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username,
|
|||||||
|
|
||||||
/* Generate a client nonce. */
|
/* Generate a client nonce. */
|
||||||
for (i = 0; i < 2; i++)
|
for (i = 0; i < 2; i++)
|
||||||
cnonce_buf[i] = ff_random_get_seed();
|
cnonce_buf[i] = av_get_random_seed();
|
||||||
ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, sizeof(cnonce_buf), 1);
|
ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, sizeof(cnonce_buf), 1);
|
||||||
cnonce[2*sizeof(cnonce_buf)] = 0;
|
cnonce[2*sizeof(cnonce_buf)] = 0;
|
||||||
|
|
||||||
|
@ -1389,7 +1389,7 @@ static uint64_t mxf_parse_timestamp(time_t timestamp)
|
|||||||
static void mxf_gen_umid(AVFormatContext *s)
|
static void mxf_gen_umid(AVFormatContext *s)
|
||||||
{
|
{
|
||||||
MXFContext *mxf = s->priv_data;
|
MXFContext *mxf = s->priv_data;
|
||||||
uint32_t seed = ff_random_get_seed();
|
uint32_t seed = av_get_random_seed();
|
||||||
uint64_t umid = seed + 0x5294713400000000LL;
|
uint64_t umid = seed + 0x5294713400000000LL;
|
||||||
|
|
||||||
AV_WB64(mxf->umid , umid);
|
AV_WB64(mxf->umid , umid);
|
||||||
|
@ -80,10 +80,10 @@ static int rtp_write_header(AVFormatContext *s1)
|
|||||||
if (s->payload_type < 0)
|
if (s->payload_type < 0)
|
||||||
s->payload_type = RTP_PT_PRIVATE + (st->codec->codec_type == AVMEDIA_TYPE_AUDIO);
|
s->payload_type = RTP_PT_PRIVATE + (st->codec->codec_type == AVMEDIA_TYPE_AUDIO);
|
||||||
|
|
||||||
s->base_timestamp = ff_random_get_seed();
|
s->base_timestamp = av_get_random_seed();
|
||||||
s->timestamp = s->base_timestamp;
|
s->timestamp = s->base_timestamp;
|
||||||
s->cur_timestamp = 0;
|
s->cur_timestamp = 0;
|
||||||
s->ssrc = ff_random_get_seed();
|
s->ssrc = av_get_random_seed();
|
||||||
s->first_packet = 1;
|
s->first_packet = 1;
|
||||||
s->first_rtcp_ntp_time = ff_ntp_time();
|
s->first_rtcp_ntp_time = ff_ntp_time();
|
||||||
if (s1->start_time_realtime)
|
if (s1->start_time_realtime)
|
||||||
|
@ -19,6 +19,7 @@ HEADERS = adler32.h \
|
|||||||
mem.h \
|
mem.h \
|
||||||
pixdesc.h \
|
pixdesc.h \
|
||||||
pixfmt.h \
|
pixfmt.h \
|
||||||
|
random_seed.h \
|
||||||
rational.h \
|
rational.h \
|
||||||
sha1.h \
|
sha1.h \
|
||||||
|
|
||||||
|
@ -22,8 +22,9 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include "timer.h"
|
#include "timer.h"
|
||||||
#include "random_seed.h"
|
#include "random_seed.h"
|
||||||
|
#include "avutil.h"
|
||||||
|
|
||||||
uint32_t ff_random_get_seed(void)
|
uint32_t av_get_random_seed(void)
|
||||||
{
|
{
|
||||||
uint32_t seed;
|
uint32_t seed;
|
||||||
int fd;
|
int fd;
|
||||||
@ -42,3 +43,11 @@ uint32_t ff_random_get_seed(void)
|
|||||||
// XXX what to do ?
|
// XXX what to do ?
|
||||||
return seed;
|
return seed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if LIBAVUTIL_VERSION_MAJOR < 51
|
||||||
|
attribute_deprecated uint32_t ff_random_get_seed(void);
|
||||||
|
uint32_t ff_random_get_seed(void)
|
||||||
|
{
|
||||||
|
return av_get_random_seed();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@ -26,6 +26,6 @@
|
|||||||
/**
|
/**
|
||||||
* Gets a seed to use in conjunction with random functions.
|
* Gets a seed to use in conjunction with random functions.
|
||||||
*/
|
*/
|
||||||
uint32_t ff_random_get_seed(void);
|
uint32_t av_get_random_seed(void);
|
||||||
|
|
||||||
#endif /* AVUTIL_RANDOM_SEED_H */
|
#endif /* AVUTIL_RANDOM_SEED_H */
|
||||||
|
Reference in New Issue
Block a user