Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use mp3 header frame format to mark streams encoded by liquidsoap.

Documented in code and encoding_formats.txt

--HG--
rename : ocaml-mad/examples/Makefile.mp32wav.in => ocaml-mad/examples/Makefile.decode_msg
rename : ocaml-mad/examples/Makefile.mp32wav.in => ocaml-mad/examples/Makefile.mp32wav
rename : ocaml-mad/examples/Makefile.mp3info.in => ocaml-mad/examples/Makefile.mp3info
rename : ocaml-mad/examples/mp32wav.ml => ocaml-mad/examples/decode_msg.ml
extra : rebase_source : 553f5cabff7dbbe2b14b5568e9e5090488351ae9
  • Loading branch information...
commit 878c0da8183928000f5a172624db3fdd8e0e6bae 1 parent 22b7795
@toots toots authored
Showing with 12 additions and 7 deletions.
  1. +5 −0 CHANGES
  2. +1 −1  configure.ac
  3. +4 −4 src/vorbis.ml
  4. +2 −2 src/vorbis.mli
View
5 CHANGES
@@ -1,3 +1,8 @@
+0.6.1 ()
+=====
+* Added optional encoder field for
+ headerout functions.
+
0.6.0 (04-07-2011)
=====
* Changed Vorbis.File opening API
View
2  configure.ac
@@ -1,7 +1,7 @@
# $Id$
# check for one particular file of the sources
-AC_INIT(ocaml-vorbis, 0.6.0, savonet-users@lists.sourceforge.net)
+AC_INIT(ocaml-vorbis, 0.6.1, savonet-users@lists.sourceforge.net)
VERSION=$PACKAGE_VERSION
AC_MSG_RESULT(configuring $PACKAGE_STRING)
View
8 src/vorbis.ml
@@ -140,12 +140,12 @@ struct
external headerout_packetout : t -> (string * string) array -> Ogg.Stream.packet*Ogg.Stream.packet*Ogg.Stream.packet = "ocaml_vorbis_analysis_headerout"
- let headerout_packetout state tags =
- let tags = Array.of_list (tags@[("ENCODER", encoder_tag)]) in
+ let headerout_packetout ?(encoder=encoder_tag) state tags =
+ let tags = Array.of_list (tags@[("ENCODER", encoder)]) in
headerout_packetout state tags
- let headerout state os tags =
- let p1,p2,p3 = headerout_packetout state tags in
+ let headerout ?encoder state os tags =
+ let p1,p2,p3 = headerout_packetout ?encoder state tags in
Ogg.Stream.put_packet os p1;
Ogg.Stream.put_packet os p2;
Ogg.Stream.put_packet os p3
View
4 src/vorbis.mli
@@ -130,13 +130,13 @@ sig
val reset : t -> unit
(** Encode a header given a list of tags. *)
- val headerout : t -> Ogg.Stream.t -> (string * string) list -> unit
+ val headerout : ?encoder:string -> t -> Ogg.Stream.t -> (string * string) list -> unit
(** Encoder a header, but do not submit packet to
* Ogg Stream. Usefull when multiplexing ogg streams
* since the all first packets of each streams must be packed
* in the initial pages. *)
- val headerout_packetout : t -> (string * string) list -> Ogg.Stream.packet*Ogg.Stream.packet*Ogg.Stream.packet
+ val headerout_packetout : ?encoder:string -> t -> (string * string) list -> Ogg.Stream.packet*Ogg.Stream.packet*Ogg.Stream.packet
(** Get the number of audio channels expected by
* the encoder. *)
Please sign in to comment.
Something went wrong with that request. Please try again.