mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 00:36:51 +00:00
gst/gsterror.*: Add two new error codes for encrypted content. Fixes #524659.
Original commit message from CVS: Based on patch by: Milosz Derezynski <internalerror gmail com> * gst/gsterror.c: (_gst_stream_errors_init): * gst/gsterror.h: Add two new error codes for encrypted content. Fixes #524659. API: GST_STREAM_ERROR_DECRYPT API: GST_STREAM_ERROR_DECRYPT_NOKEY
This commit is contained in:
parent
50a1828572
commit
caff4eb9a6
3 changed files with 21 additions and 0 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2008-04-09 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
Based on patch by: Milosz Derezynski <internalerror gmail com>
|
||||||
|
|
||||||
|
* gst/gsterror.c: (_gst_stream_errors_init):
|
||||||
|
* gst/gsterror.h:
|
||||||
|
Add two new error codes for encrypted content. Fixes #524659.
|
||||||
|
API: GST_STREAM_ERROR_DECRYPT
|
||||||
|
API: GST_STREAM_ERROR_DECRYPT_NOKEY
|
||||||
|
|
||||||
2008-04-09 Tim-Philipp Müller <tim at centricular dot net>
|
2008-04-09 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
* gst/gstquery.h:
|
* gst/gstquery.h:
|
||||||
|
|
|
@ -244,6 +244,11 @@ _gst_stream_errors_init (void)
|
||||||
TABLE (t, STREAM, DEMUX, N_("Could not demultiplex stream."));
|
TABLE (t, STREAM, DEMUX, N_("Could not demultiplex stream."));
|
||||||
TABLE (t, STREAM, MUX, N_("Could not multiplex stream."));
|
TABLE (t, STREAM, MUX, N_("Could not multiplex stream."));
|
||||||
TABLE (t, STREAM, FORMAT, N_("The stream is in the wrong format."));
|
TABLE (t, STREAM, FORMAT, N_("The stream is in the wrong format."));
|
||||||
|
TABLE (t, STREAM, DECRYPT,
|
||||||
|
N_("The stream is encrypted and decryption is not supported."));
|
||||||
|
TABLE (t, STREAM, DECRYPT_NOKEY,
|
||||||
|
N_("The stream is encrypted and can't be decrypted because no suitable"
|
||||||
|
"key has been supplied."));
|
||||||
|
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
|
@ -169,6 +169,10 @@ typedef enum
|
||||||
* @GST_STREAM_ERROR_MUX: used when muxing fails.
|
* @GST_STREAM_ERROR_MUX: used when muxing fails.
|
||||||
* @GST_STREAM_ERROR_FORMAT: used when the stream is of the wrong format
|
* @GST_STREAM_ERROR_FORMAT: used when the stream is of the wrong format
|
||||||
* (for example, wrong caps).
|
* (for example, wrong caps).
|
||||||
|
* @GST_STREAM_ERROR_DECRYPT: used when the stream is encrypted and can't be
|
||||||
|
* decrypted because this is not supported by the element. (Since: 0.10.20)
|
||||||
|
* @GST_STREAM_ERROR_DECRYPT_NOKEY: used when the stream is encrypted and
|
||||||
|
* can't be decrypted because no suitable key is available. (Since: 0.10.20)
|
||||||
* @GST_STREAM_ERROR_NUM_ERRORS: the number of stream error types.
|
* @GST_STREAM_ERROR_NUM_ERRORS: the number of stream error types.
|
||||||
*
|
*
|
||||||
* Stream errors are for anything related to the stream being processed:
|
* Stream errors are for anything related to the stream being processed:
|
||||||
|
@ -188,6 +192,8 @@ typedef enum
|
||||||
GST_STREAM_ERROR_DEMUX,
|
GST_STREAM_ERROR_DEMUX,
|
||||||
GST_STREAM_ERROR_MUX,
|
GST_STREAM_ERROR_MUX,
|
||||||
GST_STREAM_ERROR_FORMAT,
|
GST_STREAM_ERROR_FORMAT,
|
||||||
|
GST_STREAM_ERROR_DECRYPT,
|
||||||
|
GST_STREAM_ERROR_DECRYPT_NOKEY,
|
||||||
GST_STREAM_ERROR_NUM_ERRORS
|
GST_STREAM_ERROR_NUM_ERRORS
|
||||||
} GstStreamError;
|
} GstStreamError;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue